409 files changed, 493 insertions, 494 deletions

diff --git a/src/examples/efl_mono/example_numberwrapper.eo b/src/examples/efl_mono/example_numberwrapper.eo
index 4e0279e..43de18d 100644
--- a/src/examples/efl_mono/example_numberwrapper.eo
+++ b/src/examples/efl_mono/example_numberwrapper.eo
@@ -5,7 +5,7 @@ function NumberCb {
    return: int;
 };
 
-class Example.Numberwrapper (Efl.Object) {
+class Example.Numberwrapper extends Efl.Object {
    methods {
       @property number {
          get {
diff --git a/src/examples/eolian_cxx/ns_colourable.eo b/src/examples/eolian_cxx/ns_colourable.eo
index bfb08b2..8fce408 100644
--- a/src/examples/eolian_cxx/ns_colourable.eo
+++ b/src/examples/eolian_cxx/ns_colourable.eo
@@ -1,4 +1,4 @@
-class Ns.Colourable (Efl.Object)
+class Ns.Colourable extends Efl.Object
 {
     [[Colourable class.]]
     data: Colourable_Data;
diff --git a/src/examples/eolian_cxx/ns_colourablesquare.eo b/src/examples/eolian_cxx/ns_colourablesquare.eo
index 66fe8ae..733701f 100644
--- a/src/examples/eolian_cxx/ns_colourablesquare.eo
+++ b/src/examples/eolian_cxx/ns_colourablesquare.eo
@@ -1,4 +1,4 @@
-class Ns.ColourableSquare (Ns.Colourable)
+class Ns.ColourableSquare extends Ns.Colourable
 {
     data: ColourableSquare_Data;
     methods {
diff --git a/src/lib/ecore/ecore_event_message.eo b/src/lib/ecore/ecore_event_message.eo
index aae68c1..80ec985 100644
--- a/src/lib/ecore/ecore_event_message.eo
+++ b/src/lib/ecore/ecore_event_message.eo
@@ -1,4 +1,4 @@
-class Ecore.Event.Message (Efl.Loop_Message)
+class Ecore.Event.Message extends Efl.Loop_Message
 {
    [[ For Legacy API usage Only. Legacy Ecore Events ]]
    methods {
diff --git a/src/lib/ecore/ecore_event_message_handler.eo b/src/lib/ecore/ecore_event_message_handler.eo
index f6f9c07..c2bc6b9 100644
--- a/src/lib/ecore/ecore_event_message_handler.eo
+++ b/src/lib/ecore/ecore_event_message_handler.eo
@@ -1,4 +1,4 @@
-class Ecore.Event.Message.Handler (Efl.Loop_Message_Handler)
+class Ecore.Event.Message.Handler extends Efl.Loop_Message_Handler
 {
    [[ For Legacy API usage Only
       This class is rather hacky/messy as it's really internal glue
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index 5d9084f..899d8a0 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -39,7 +39,7 @@ enum Ecore.Exe_Flags
    isolate_io = 1024, [[Try and isolate stdin/out and err of the process so it isn't shared with the parent.]]
 }
 
-class Ecore.Exe (Efl.Object, Efl.Control)
+class Ecore.Exe extends Efl.Object implements Efl.Control
 {
    [[Ecore.Exe is responsible for managing portable process spawning.
 
diff --git a/src/lib/ecore/efl_accelerate_interpolator.eo b/src/lib/ecore/efl_accelerate_interpolator.eo
index 3c94735..793f8b6 100644
--- a/src/lib/ecore/efl_accelerate_interpolator.eo
+++ b/src/lib/ecore/efl_accelerate_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Accelerate_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Accelerate_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl accelerate interpolator class
 
diff --git a/src/lib/ecore/efl_app.eo b/src/lib/ecore/efl_app.eo
index 860de3a..30f0e98 100644
--- a/src/lib/ecore/efl_app.eo
+++ b/src/lib/ecore/efl_app.eo
@@ -1,6 +1,6 @@
 import efl_types;
 
-class Efl.App (Efl.Loop)
+class Efl.App extends Efl.Loop
 {
    [[ ]]
    methods {
diff --git a/src/lib/ecore/efl_appthread.eo b/src/lib/ecore/efl_appthread.eo
index 436846e..964d128 100644
--- a/src/lib/ecore/efl_appthread.eo
+++ b/src/lib/ecore/efl_appthread.eo
@@ -1,4 +1,4 @@
-class Efl.Appthread (Efl.Loop, Efl.ThreadIO)
+class Efl.Appthread extends Efl.Loop implements Efl.ThreadIO
 {
    [[ ]]
    methods {
diff --git a/src/lib/ecore/efl_bounce_interpolator.eo b/src/lib/ecore/efl_bounce_interpolator.eo
index eaa5512..85dc219 100644
--- a/src/lib/ecore/efl_bounce_interpolator.eo
+++ b/src/lib/ecore/efl_bounce_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Bounce_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Bounce_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl bounce interpolator class]]
    data: Efl_Bounce_Interpolator_Data;
diff --git a/src/lib/ecore/efl_cubic_bezier_interpolator.eo b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
index 9d910f4..a4dd964 100644
--- a/src/lib/ecore/efl_cubic_bezier_interpolator.eo
+++ b/src/lib/ecore/efl_cubic_bezier_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Cubic_Bezier_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Cubic_Bezier_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl cubic_bezier interpolator class]]
    data: Efl_Cubic_Bezier_Interpolator_Data;
diff --git a/src/lib/ecore/efl_decelerate_interpolator.eo b/src/lib/ecore/efl_decelerate_interpolator.eo
index 1662cff..3e376f8 100644
--- a/src/lib/ecore/efl_decelerate_interpolator.eo
+++ b/src/lib/ecore/efl_decelerate_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Decelerate_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Decelerate_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl decelerate interpolator class
 
diff --git a/src/lib/ecore/efl_divisor_interpolator.eo b/src/lib/ecore/efl_divisor_interpolator.eo
index 487f8f2..f9baae5 100644
--- a/src/lib/ecore/efl_divisor_interpolator.eo
+++ b/src/lib/ecore/efl_divisor_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Divisor_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Divisor_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl divisor interpolator class]]
    data: Efl_Divisor_Interpolator_Data;
diff --git a/src/lib/ecore/efl_exe.eo b/src/lib/ecore/efl_exe.eo
index c58451c..54249da 100644
--- a/src/lib/ecore/efl_exe.eo
+++ b/src/lib/ecore/efl_exe.eo
@@ -19,7 +19,7 @@ enum Efl.Exe_Flags {
    hide_io          = 4
 }
 
-class Efl.Exe (Efl.Task)
+class Efl.Exe extends Efl.Task
 {
    [[ ]]
    methods {
diff --git a/src/lib/ecore/efl_io_buffered_stream.eo b/src/lib/ecore/efl_io_buffered_stream.eo
index 2104b3f..8e22b82 100644
--- a/src/lib/ecore/efl_io_buffered_stream.eo
+++ b/src/lib/ecore/efl_io_buffered_stream.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Buffered_Stream (Efl.Loop_Consumer, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
+class Efl.Io.Buffered_Stream extends Efl.Loop_Consumer implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
     [[A wrapper object offering easy to use buffered streams over existing I/O class.
 
       The buffered stream encapsulates an actual @Efl.Io.Reader or
diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo
index 423233a..2565fba 100644
--- a/src/lib/ecore/efl_io_copier.eo
+++ b/src/lib/ecore/efl_io_copier.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Io.Copier (Efl.Loop_Consumer, Efl.Io.Closer) {
+class Efl.Io.Copier extends Efl.Loop_Consumer implements Efl.Io.Closer {
     [[Copy from an @Efl.Io.Reader source to @Efl.Io.Writer destination.
 
       During usage it will keep reference to @.source and
diff --git a/src/lib/ecore/efl_io_file.eo b/src/lib/ecore/efl_io_file.eo
index b586a88..c0b48c3 100644
--- a/src/lib/ecore/efl_io_file.eo
+++ b/src/lib/ecore/efl_io_file.eo
@@ -1,4 +1,4 @@
-class Efl.Io.File (Efl.Loop_Fd, Efl.File, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Io.Sizer_Fd, Efl.Io.Positioner_Fd) {
+class Efl.Io.File extends Efl.Loop_Fd implements Efl.File, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Io.Sizer_Fd, Efl.Io.Positioner_Fd {
     [[File access (open, close, read, write, lseek, ftruncate)
 
       @Efl.Io.Closer.close_on_exec and
diff --git a/src/lib/ecore/efl_io_stderr.eo b/src/lib/ecore/efl_io_stderr.eo
index 8b92505..c8ecff3 100644
--- a/src/lib/ecore/efl_io_stderr.eo
+++ b/src/lib/ecore/efl_io_stderr.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stderr (Efl.Loop_Fd, Efl.Io.Writer_Fd) {
+class Efl.Io.Stderr extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
     [[Application's standard error (stderr).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_stdin.eo b/src/lib/ecore/efl_io_stdin.eo
index 8389ed2..1d4b914 100644
--- a/src/lib/ecore/efl_io_stdin.eo
+++ b/src/lib/ecore/efl_io_stdin.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stdin (Efl.Loop_Fd, Efl.Io.Reader_Fd) {
+class Efl.Io.Stdin extends Efl.Loop_Fd implements Efl.Io.Reader_Fd {
     [[Application's standard input (stdin).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_stdout.eo b/src/lib/ecore/efl_io_stdout.eo
index d985281..1bc7099 100644
--- a/src/lib/ecore/efl_io_stdout.eo
+++ b/src/lib/ecore/efl_io_stdout.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Stdout (Efl.Loop_Fd, Efl.Io.Writer_Fd) {
+class Efl.Io.Stdout extends Efl.Loop_Fd implements Efl.Io.Writer_Fd {
     [[Application's standard output (stdout).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_linear_interpolator.eo b/src/lib/ecore/efl_linear_interpolator.eo
index 8872616..748a3be 100644
--- a/src/lib/ecore/efl_linear_interpolator.eo
+++ b/src/lib/ecore/efl_linear_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Linear_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Linear_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl linear interpolator class]]
    data: Efl_Linear_Interpolator_Data;
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 3a40861..5ced4e7 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Fd (Efl.Loop_Consumer)
+class Efl.Loop_Fd extends Efl.Loop_Consumer
 {
    [[Fds are objects that watch the activity on a given
      file descriptor. This file descriptor can be a
diff --git a/src/lib/ecore/efl_loop_handler.eo b/src/lib/ecore/efl_loop_handler.eo
index 0058ceb..aab8443 100644
--- a/src/lib/ecore/efl_loop_handler.eo
+++ b/src/lib/ecore/efl_loop_handler.eo
@@ -7,7 +7,7 @@ enum Efl.Loop_Handler_Flags {
    error = 4, [[ Error channel input is desired ]]
 }
 
-class Efl.Loop_Handler (Efl.Object)
+class Efl.Loop_Handler extends Efl.Object
 {
    [[ An object that describes an low-level source of I/O to listen to
    for available data to be read or written, depending on the OS and data
diff --git a/src/lib/ecore/efl_loop_message.eo b/src/lib/ecore/efl_loop_message.eo
index 2aec142..ef5ec0c 100644
--- a/src/lib/ecore/efl_loop_message.eo
+++ b/src/lib/ecore/efl_loop_message.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message (Efl.Object)
+class Efl.Loop_Message extends Efl.Object
 {
    [[Base message payload object class. Inherit this and extend for
      specific message types.]]
diff --git a/src/lib/ecore/efl_loop_message_future.eo b/src/lib/ecore/efl_loop_message_future.eo
index 5a86333..047c1c4 100644
--- a/src/lib/ecore/efl_loop_message_future.eo
+++ b/src/lib/ecore/efl_loop_message_future.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Future (Efl.Loop_Message)
+class Efl.Loop_Message_Future extends Efl.Loop_Message
 {
    [[ Used internally for futures on the loop ]]
    methods {
diff --git a/src/lib/ecore/efl_loop_message_future_handler.eo b/src/lib/ecore/efl_loop_message_future_handler.eo
index 0b30847..a676555 100644
--- a/src/lib/ecore/efl_loop_message_future_handler.eo
+++ b/src/lib/ecore/efl_loop_message_future_handler.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Future_Handler (Efl.Loop_Message_Handler)
+class Efl.Loop_Message_Future_Handler extends Efl.Loop_Message_Handler
 {
    [[ Internal use for future on an efl loop - replacing legacy ecore events ]]
    methods {
diff --git a/src/lib/ecore/efl_loop_message_handler.eo b/src/lib/ecore/efl_loop_message_handler.eo
index bf77810..291b0bc 100644
--- a/src/lib/ecore/efl_loop_message_handler.eo
+++ b/src/lib/ecore/efl_loop_message_handler.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Message_Handler (Efl.Object)
+class Efl.Loop_Message_Handler extends Efl.Object
 {
    [[Message handlers represent a single message type on the Efl.Loop
      parent object. These message handlers can be used to listen for
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 2b5ce08..44841d8 100644
--- a/src/lib/ecore/efl_loop_timer.eo
+++ b/src/lib/ecore/efl_loop_timer.eo
@@ -1,4 +1,4 @@
-class Efl.Loop_Timer (Efl.Loop_Consumer)
+class Efl.Loop_Timer extends Efl.Loop_Consumer
 {
    [[Timers are objects that will call a given callback at some point
      in the future and repeat that tick at a given interval.
diff --git a/src/lib/ecore/efl_model_composite.eo b/src/lib/ecore/efl_model_composite.eo
index be05c98..d353a2e 100644
--- a/src/lib/ecore/efl_model_composite.eo
+++ b/src/lib/ecore/efl_model_composite.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Composite (Efl.Model_Loop, Efl.Ui.View)
+class Efl.Model_Composite extends Efl.Model_Loop implements Efl.Ui.View
 {
    [[Efl model for all composite class which provide a unified API to set source of data]]
    implements {
diff --git a/src/lib/ecore/efl_model_composite_boolean.eo b/src/lib/ecore/efl_model_composite_boolean.eo
index 21bf540..47c7e3c 100644
--- a/src/lib/ecore/efl_model_composite_boolean.eo
+++ b/src/lib/ecore/efl_model_composite_boolean.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Composite_Boolean (Efl.Model_Composite)
+class Efl.Model_Composite_Boolean extends Efl.Model_Composite
 {
    [[Efl model composite boolean class]]
    methods {
diff --git a/src/lib/ecore/efl_model_composite_boolean_children.eo b/src/lib/ecore/efl_model_composite_boolean_children.eo
index 45bb2f6..d06a9cc 100644
--- a/src/lib/ecore/efl_model_composite_boolean_children.eo
+++ b/src/lib/ecore/efl_model_composite_boolean_children.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Composite_Boolean_Children (Efl.Model_Composite)
+class Efl.Model_Composite_Boolean_Children extends Efl.Model_Composite
 {
    [[Efl model composite boolean children class]]
    methods {
diff --git a/src/lib/ecore/efl_model_composite_selection.eo b/src/lib/ecore/efl_model_composite_selection.eo
index fca9b9c..35ecc27 100644
--- a/src/lib/ecore/efl_model_composite_selection.eo
+++ b/src/lib/ecore/efl_model_composite_selection.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Composite_Selection (Efl.Model_Composite_Boolean)
+class Efl.Model_Composite_Selection extends Efl.Model_Composite_Boolean
 {
    [[Efl model composite selection class]]
    implements {
diff --git a/src/lib/ecore/efl_model_composite_selection_children.eo b/src/lib/ecore/efl_model_composite_selection_children.eo
index ef2af4d..ce59ea2 100644
--- a/src/lib/ecore/efl_model_composite_selection_children.eo
+++ b/src/lib/ecore/efl_model_composite_selection_children.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Composite_Selection_Children (Efl.Model_Composite_Boolean_Children)
+class Efl.Model_Composite_Selection_Children extends Efl.Model_Composite_Boolean_Children
 {
    [[Efl model composite selection children class]]
    implements {
diff --git a/src/lib/ecore/efl_model_container.eo b/src/lib/ecore/efl_model_container.eo
index 04b1d5a..04fbdf8 100644
--- a/src/lib/ecore/efl_model_container.eo
+++ b/src/lib/ecore/efl_model_container.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Model_Container (Efl.Model_Loop)
+class Efl.Model_Container extends Efl.Model_Loop
 {
    [[
      Class used to create data models from Eina containers.
diff --git a/src/lib/ecore/efl_model_container_item.eo b/src/lib/ecore/efl_model_container_item.eo
index f20ae03..f085043 100644
--- a/src/lib/ecore/efl_model_container_item.eo
+++ b/src/lib/ecore/efl_model_container_item.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Container_Item (Efl.Object, Efl.Model)
+class Efl.Model_Container_Item extends Efl.Object implements Efl.Model
 {
    [[
      Used as a child of @Efl.Model_Container.
diff --git a/src/lib/ecore/efl_model_item.eo b/src/lib/ecore/efl_model_item.eo
index 1276be6..8543eec 100644
--- a/src/lib/ecore/efl_model_item.eo
+++ b/src/lib/ecore/efl_model_item.eo
@@ -1,4 +1,4 @@
-class Efl.Model_Item (Efl.Model_Loop)
+class Efl.Model_Item extends Efl.Model_Loop
 {
    [[
      Generic model that allows any property to be manually set.
diff --git a/src/lib/ecore/efl_model_loop.eo b/src/lib/ecore/efl_model_loop.eo
index be4fe6a..f0b34ab 100644
--- a/src/lib/ecore/efl_model_loop.eo
+++ b/src/lib/ecore/efl_model_loop.eo
@@ -1,7 +1,7 @@
-class Efl.Model_Loop (Efl.Loop_Consumer, Efl.Model)
+class Efl.Model_Loop extends Efl.Loop_Consumer implements Efl.Model
 {
    data: null;
    implements {
       Efl.Model.property_ready_get;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/ecore/efl_model_view.eo b/src/lib/ecore/efl_model_view.eo
index 244d8f4..ccfa354 100644
--- a/src/lib/ecore/efl_model_view.eo
+++ b/src/lib/ecore/efl_model_view.eo
@@ -17,7 +17,7 @@ function EflModelViewPropertySet {
    return: future<any_value_ptr>; [[The value that was finally set.]]
 };
 
-class Efl.Model_View (Efl.Model_Composite)
+class Efl.Model_View extends Efl.Model_Composite
 {
    [[Efl model providing helpers for custom properties used when linking a model to a view and you need to generate/adapt values for display.
 
diff --git a/src/lib/ecore/efl_sinusoidal_interpolator.eo b/src/lib/ecore/efl_sinusoidal_interpolator.eo
index d602b96..2f644ff 100644
--- a/src/lib/ecore/efl_sinusoidal_interpolator.eo
+++ b/src/lib/ecore/efl_sinusoidal_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Sinusoidal_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Sinusoidal_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl sinusoidal interpolator class
 
diff --git a/src/lib/ecore/efl_spring_interpolator.eo b/src/lib/ecore/efl_spring_interpolator.eo
index 2169816..1459342 100644
--- a/src/lib/ecore/efl_spring_interpolator.eo
+++ b/src/lib/ecore/efl_spring_interpolator.eo
@@ -1,4 +1,4 @@
-class Efl.Spring_Interpolator (Efl.Object, Efl.Interpolator)
+class Efl.Spring_Interpolator extends Efl.Object implements Efl.Interpolator
 {
    [[Efl spring interpolator class]]
    data: Efl_Spring_Interpolator_Data;
diff --git a/src/lib/ecore/efl_thread.eo b/src/lib/ecore/efl_thread.eo
index 565bca4..aedc0c2 100644
--- a/src/lib/ecore/efl_thread.eo
+++ b/src/lib/ecore/efl_thread.eo
@@ -1,4 +1,4 @@
-class Efl.Thread (Efl.Task, Efl.ThreadIO)
+class Efl.Thread extends Efl.Task implements Efl.ThreadIO
 {
    methods {
    }
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 43f0d7b..9b79e62 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.In (Ecore.Audio)
+class Ecore.Audio.In extends Ecore.Audio
 {
    [[Ecore Audio input object.]]
    eo_prefix: ecore_audio_obj_in;
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 533e4b2..76aeb42 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.In.Sndfile (Ecore.Audio.In)
+class Ecore.Audio.In.Sndfile extends Ecore.Audio.In
 {
    [[Ecore Audio sndfile input.]]
    eo_prefix: ecore_audio_obj_in_sndfile;
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index 8cdd935..8e6e3d4 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.In.Tone (Ecore.Audio.In)
+class Ecore.Audio.In.Tone extends Ecore.Audio.In
 {
    [[Ecore Audio tone input.]]
    eo_prefix: ecore_audio_obj_in_tone;
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index a89e15c..72d65d1 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.Out (Ecore.Audio)
+class Ecore.Audio.Out extends Ecore.Audio
 {
    [[Ecore Audio output object.]]
 
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 2e97f4e..6d28e7e 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.Out.Pulse (Ecore.Audio.Out)
+class Ecore.Audio.Out.Pulse extends Ecore.Audio.Out
 {
    [[Ecore audio ouput for PulseAudio.]]
    eo_prefix: ecore_audio_obj_out_pulse;
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index 1045fd4..e5358d5 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.Out.Sndfile (Ecore.Audio.Out)
+class Ecore.Audio.Out.Sndfile extends Ecore.Audio.Out
 {
    [[Ecore audio output to the sndfile library.]]
    eo_prefix: ecore_audio_obj_out_sndfile;
diff --git a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
index 14c9127..00c503d 100644
--- a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo
@@ -1,4 +1,4 @@
-class Ecore.Audio.Out.Wasapi (Ecore.Audio.Out)
+class Ecore.Audio.Out.Wasapi extends Ecore.Audio.Out
 {
    [[Ecore audio ouput for WasapiAudio.]]
    eo_prefix: ecore_audio_obj_out_wasapi;
diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo
index 76bdb3a..26717ef 100644
--- a/src/lib/ecore_con/ecore_con_eet_base.eo
+++ b/src/lib/ecore_con/ecore_con_eet_base.eo
@@ -5,9 +5,9 @@ type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; [[Ecore connection eet
 struct @extern Eet.Data.Descriptor; [[Eet data descriptor data structure]]
 struct Ecore.Con.Reply; [[Ecore connection reply data structure]]
 
-class Ecore.Con.Eet.Base (Efl.Object) {
+class Ecore.Con.Eet.Base extends Efl.Object {
    [[Ecore Connection Eet Base class.
-   
+
    This class provides Eet data serialization features to Ecore Connection objects.]]
 
    methods {
diff --git a/src/lib/ecore_con/ecore_con_eet_client_obj.eo b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
index a9eb6bb..8b5955a 100644
--- a/src/lib/ecore_con/ecore_con_eet_client_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_client_obj.eo
@@ -1,4 +1,4 @@
-class Ecore.Con.Eet.Client.Obj (Ecore.Con.Eet.Base) {
+class Ecore.Con.Eet.Client.Obj extends Ecore.Con.Eet.Base {
    [[Ecore Connection Eet Client class.]]
 
    eo_prefix: ecore_con_eet_client_obj;
diff --git a/src/lib/ecore_con/ecore_con_eet_server_obj.eo b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
index d561833..11c97d4 100644
--- a/src/lib/ecore_con/ecore_con_eet_server_obj.eo
+++ b/src/lib/ecore_con/ecore_con_eet_server_obj.eo
@@ -1,4 +1,4 @@
-class Ecore.Con.Eet.Server.Obj (Ecore.Con.Eet.Base) {
+class Ecore.Con.Eet.Server.Obj extends Ecore.Con.Eet.Base {
    [[Ecore Connection Eet Server class.]]
 
    eo_prefix: ecore_con_eet_server_obj;
diff --git a/src/lib/ecore_con/efl_net_control_access_point.eo b/src/lib/ecore_con/efl_net_control_access_point.eo
index 5aaf13b..5390303 100644
--- a/src/lib/ecore_con/efl_net_control_access_point.eo
+++ b/src/lib/ecore_con/efl_net_control_access_point.eo
@@ -74,7 +74,7 @@ enum Efl.Net.Control.Access_Point_Proxy_Method {
     unset, [[Only to be used with @Efl.Net.Control.Access_Point.configuration_proxy.]]
 }
 
-class Efl.Net.Control.Access_Point (Efl.Loop_Consumer) {
+class Efl.Net.Control.Access_Point extends Efl.Loop_Consumer {
     [[An access point for network connectivity.
 
       The @Efl.Net.Control.Manager is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_control_manager.eo b/src/lib/ecore_con/efl_net_control_manager.eo
index cfe9145..5afdeb4 100644
--- a/src/lib/ecore_con/efl_net_control_manager.eo
+++ b/src/lib/ecore_con/efl_net_control_manager.eo
@@ -65,7 +65,7 @@ struct Efl.Net.Control.Agent_Browser_Url {
     url: string; [[The URL to point the browser at.]]
 }
 
-class Efl.Net.Control.Manager (Efl.Loop_Consumer) {
+class Efl.Net.Control.Manager extends Efl.Loop_Consumer {
     [[Controls network connectivity.
 
       This class and its child objects are only useful to implement
diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo
index 04e0a4c..ccc2cf6 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -15,7 +15,7 @@ enum Efl.Net.Control.Technology_Type {
     p2p, [[Type: Peer-2-Peer]]
 }
 
-class Efl.Net.Control.Technology (Efl.Loop_Consumer) {
+class Efl.Net.Control.Technology extends Efl.Loop_Consumer {
     [[A technology that allows control of network access points.
 
       The @Efl.Net.Control.Manager is composed of multiple technologies, each
diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo
index 95a1043..18c0c35 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.eo
+++ b/src/lib/ecore_con/efl_net_dialer_http.eo
@@ -7,7 +7,7 @@ enum Efl.Net.Dialer_Http_Primary_Mode {
     upload, [[HTTP upload mode]]
 }
 
-class Efl.Net.Dialer_Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) {
+class Efl.Net.Dialer_Http extends Efl.Loop_Consumer implements Efl.Net.Dialer, Efl.Io.Sizer {
     [[HTTP Dialer (Client).
 
       The effective URL in use, if @.allow_redirects is $true will be
diff --git a/src/lib/ecore_con/efl_net_dialer_simple.eo b/src/lib/ecore_con/efl_net_dialer_simple.eo
index 38ec878..0a5aa94 100644
--- a/src/lib/ecore_con/efl_net_dialer_simple.eo
+++ b/src/lib/ecore_con/efl_net_dialer_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Simple (Efl.Net.Socket_Simple, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Simple extends Efl.Net.Socket_Simple implements Efl.Net.Dialer {
     [[Connects to a remote server offering an easy to use, buffered I/O.
 
       The simple dialer is based on @Efl.Net.Socket_Simple, which
diff --git a/src/lib/ecore_con/efl_net_dialer_ssl.eo b/src/lib/ecore_con/efl_net_dialer_ssl.eo
index c732e1c..832361b 100644
--- a/src/lib/ecore_con/efl_net_dialer_ssl.eo
+++ b/src/lib/ecore_con/efl_net_dialer_ssl.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Ssl (Efl.Net.Socket_Ssl, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Ssl extends Efl.Net.Socket_Ssl implements Efl.Net.Dialer {
     [[Connects to a remote SSL server using TCP.
 
       This creates an internal @Efl.Net.Dialer_Tcp and once connected
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.eo b/src/lib/ecore_con/efl_net_dialer_tcp.eo
index 757e926..75c7dee 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.eo
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Tcp (Efl.Net.Socket_Tcp, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Tcp extends Efl.Net.Socket_Tcp implements Efl.Net.Dialer {
     [[Connects to a remote TCP server.
 
       If the proxy is NULL (default), then the system proxy will be
diff --git a/src/lib/ecore_con/efl_net_dialer_udp.eo b/src/lib/ecore_con/efl_net_dialer_udp.eo
index 4e5a407..af7aeec 100644
--- a/src/lib/ecore_con/efl_net_dialer_udp.eo
+++ b/src/lib/ecore_con/efl_net_dialer_udp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Udp (Efl.Net.Socket_Udp, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Udp extends Efl.Net.Socket_Udp implements Efl.Net.Dialer {
     [[Connects to a remote UDP server.
 
       UDP proxies are not supported, not even using SOCKSv5.
diff --git a/src/lib/ecore_con/efl_net_dialer_unix.eo b/src/lib/ecore_con/efl_net_dialer_unix.eo
index 9686cc2..f2454e5 100644
--- a/src/lib/ecore_con/efl_net_dialer_unix.eo
+++ b/src/lib/ecore_con/efl_net_dialer_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Unix (Efl.Net.Socket_Unix, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Unix extends Efl.Net.Socket_Unix implements Efl.Net.Dialer {
     [[Connects to a local AF_UNIX server.
 
       The dial address is a file system path (portable) or
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index 6c8f0f1..f7a1812 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.eo
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.eo
@@ -47,7 +47,7 @@ struct Efl.Net.Dialer_Websocket_Closed_Reason {
     message: string; [[Textual closing reason message]]
 }
 
-class Efl.Net.Dialer_Websocket (Efl.Loop_Consumer, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Websocket extends Efl.Loop_Consumer implements Efl.Net.Dialer {
     [[WebSocket Dialer (Client).
 
       The WebSocket Protocol (https://tools.ietf.org/html/rfc6455) is
diff --git a/src/lib/ecore_con/efl_net_dialer_windows.eo b/src/lib/ecore_con/efl_net_dialer_windows.eo
index c15d5f8..202b636 100644
--- a/src/lib/ecore_con/efl_net_dialer_windows.eo
+++ b/src/lib/ecore_con/efl_net_dialer_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Dialer_Windows (Efl.Net.Socket_Windows, Efl.Net.Dialer) {
+class Efl.Net.Dialer_Windows extends Efl.Net.Socket_Windows implements Efl.Net.Dialer {
     [[Connects to a Windows NamedPipe server.
 
       The dial address will have "\\\\.\\pipe\\" prepended as required by
diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index eebbb0a..3d12631 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -12,7 +12,7 @@ struct Efl.Net.Ip_Address_Resolve_Results {
     results: array<Efl.Net.Ip_Address>; [[The resolved objects. Do not modify this array but you can keep reference to elements using efl_ref() and efl_unref()]]
 }
 
-class Efl.Net.Ip_Address (Efl.Object) {
+class Efl.Net.Ip_Address extends Efl.Object {
     [[An Internet Protocol (IP) Address.
 
       This class is a set of helpers to translate to and from address
diff --git a/src/lib/ecore_con/efl_net_server_ip.eo b/src/lib/ecore_con/efl_net_server_ip.eo
index 2c0a6bc..cb46921 100644
--- a/src/lib/ecore_con/efl_net_server_ip.eo
+++ b/src/lib/ecore_con/efl_net_server_ip.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Ip (Efl.Net.Server_Fd) {
+class Efl.Net.Server_Ip extends Efl.Net.Server_Fd {
     [[An IP server.
 
       @since 1.20
diff --git a/src/lib/ecore_con/efl_net_server_simple.eo b/src/lib/ecore_con/efl_net_server_simple.eo
index 6e3e576..3934828 100644
--- a/src/lib/ecore_con/efl_net_server_simple.eo
+++ b/src/lib/ecore_con/efl_net_server_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Simple (Efl.Loop_Consumer, Efl.Net.Server) {
+class Efl.Net.Server_Simple extends Efl.Loop_Consumer implements Efl.Net.Server {
     [[A network server wrapper that creates clients based on @Efl.Net.Socket_Simple.
 
       This is just a wrapper server. It takes an actual server
diff --git a/src/lib/ecore_con/efl_net_server_ssl.eo b/src/lib/ecore_con/efl_net_server_ssl.eo
index 50ec24d..52b0bcc 100644
--- a/src/lib/ecore_con/efl_net_server_ssl.eo
+++ b/src/lib/ecore_con/efl_net_server_ssl.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Ssl (Efl.Net.Server_Tcp) {
+class Efl.Net.Server_Ssl extends Efl.Net.Server_Tcp {
     [[A SSL server over TCP.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_tcp.eo b/src/lib/ecore_con/efl_net_server_tcp.eo
index b7c63a3..de6631a 100644
--- a/src/lib/ecore_con/efl_net_server_tcp.eo
+++ b/src/lib/ecore_con/efl_net_server_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Tcp (Efl.Net.Server_Ip) {
+class Efl.Net.Server_Tcp extends Efl.Net.Server_Ip {
     [[A TCP server.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_udp.eo b/src/lib/ecore_con/efl_net_server_udp.eo
index afc5949..3e4138e 100644
--- a/src/lib/ecore_con/efl_net_server_udp.eo
+++ b/src/lib/ecore_con/efl_net_server_udp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Udp (Efl.Net.Server_Ip) {
+class Efl.Net.Server_Udp extends Efl.Net.Server_Ip {
     [[A UDP server.
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_server_udp_client.eo b/src/lib/ecore_con/efl_net_server_udp_client.eo
index 6eeeede..205ca8b 100644
--- a/src/lib/ecore_con/efl_net_server_udp_client.eo
+++ b/src/lib/ecore_con/efl_net_server_udp_client.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Udp_Client (Efl.Object, Efl.Net.Socket) {
+class Efl.Net.Server_Udp_Client extends Efl.Object implements Efl.Net.Socket {
     [[A UDP client child of Efl.Net.Server_Udp
 
       Unlike connection protocols such as TCP or Local, UDP doesn't
diff --git a/src/lib/ecore_con/efl_net_server_unix.eo b/src/lib/ecore_con/efl_net_server_unix.eo
index 9e82ea6..9e05dd6 100644
--- a/src/lib/ecore_con/efl_net_server_unix.eo
+++ b/src/lib/ecore_con/efl_net_server_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Unix (Efl.Net.Server_Fd) {
+class Efl.Net.Server_Unix extends Efl.Net.Server_Fd {
     [[An AF_UNIX server.
 
       The @Efl.Net.Server.serve method will call bind(2) directly.
diff --git a/src/lib/ecore_con/efl_net_server_windows.eo b/src/lib/ecore_con/efl_net_server_windows.eo
index 955d972..5bd087a 100644
--- a/src/lib/ecore_con/efl_net_server_windows.eo
+++ b/src/lib/ecore_con/efl_net_server_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server_Windows (Efl.Loop_Consumer, Efl.Net.Server) {
+class Efl.Net.Server_Windows extends Efl.Loop_Consumer implements Efl.Net.Server {
     [[A Windows NamedPipe server.
 
       The @Efl.Net.Server.serve method calls CreateNamedPipe()
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index 68965ff..84db3f8 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -27,7 +27,7 @@ enum Efl.Net.Session_Technology {
     all = (Efl.Net.Session_Technology.ethernet | Efl.Net.Session_Technology.wifi | Efl.Net.Session_Technology.bluetooth | Efl.Net.Session_Technology.cellular | Efl.Net.Session_Technology.vpn | Efl.Net.Session_Technology.gadget), [[All technology types]]
 }
 
-class Efl.Net.Session (Efl.Loop_Consumer) {
+class Efl.Net.Session extends Efl.Loop_Consumer {
     [[Used by application to request network connectivity.
 
       This API is targeted at applications that need access to the
diff --git a/src/lib/ecore_con/efl_net_socket_fd.eo b/src/lib/ecore_con/efl_net_socket_fd.eo
index 951fe7f..c5b468b 100644
--- a/src/lib/ecore_con/efl_net_socket_fd.eo
+++ b/src/lib/ecore_con/efl_net_socket_fd.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Fd (Efl.Loop_Fd, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket) {
+class Efl.Net.Socket_Fd extends Efl.Loop_Fd implements Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io.Closer_Fd, Efl.Net.Socket {
     [[A base implementation for sockets over filedescriptors (fd)
 
       This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_simple.eo b/src/lib/ecore_con/efl_net_socket_simple.eo
index b204259..07b7c3e 100644
--- a/src/lib/ecore_con/efl_net_socket_simple.eo
+++ b/src/lib/ecore_con/efl_net_socket_simple.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Simple (Efl.Io.Buffered_Stream, Efl.Net.Socket) {
+class Efl.Net.Socket_Simple extends Efl.Io.Buffered_Stream implements Efl.Net.Socket {
     [[A wrapper socket offering an easy to use, buffered I/O.
 
       The simple socket encapsulates an actual @Efl.Net.Socket and
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo
index c8e3066..dc60763 100644
--- a/src/lib/ecore_con/efl_net_socket_ssl.eo
+++ b/src/lib/ecore_con/efl_net_socket_ssl.eo
@@ -1,7 +1,7 @@
 var Efl.Net.Socket_Ssl_Error.HANDSHAKE: Eina.Error; [[Failed SSL handshake]]
 var Efl.Net.Socket_Ssl_Error.CERTIFICATE_VERIFY_FAILED: Eina.Error; [[Failed to verify peer's certificate]]
 
-class Efl.Net.Socket_Ssl (Efl.Loop_Consumer, Efl.Net.Socket) {
+class Efl.Net.Socket_Ssl extends Efl.Loop_Consumer implements Efl.Net.Socket {
     [[A wrapper socket doing SSL (Secure Sockets Layer).
 
       Use this wrapper around an existing socket for secure
diff --git a/src/lib/ecore_con/efl_net_socket_tcp.eo b/src/lib/ecore_con/efl_net_socket_tcp.eo
index de40b1d..d3f0d5b 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.eo
+++ b/src/lib/ecore_con/efl_net_socket_tcp.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Tcp (Efl.Net.Socket_Fd) {
+class Efl.Net.Socket_Tcp extends Efl.Net.Socket_Fd {
     [[A base TCP socket.
 
       This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo
index 97caebc..7e2b533 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.eo
+++ b/src/lib/ecore_con/efl_net_socket_udp.eo
@@ -1,6 +1,6 @@
 import efl_net_ip_address;
 
-class Efl.Net.Socket_Udp (Efl.Net.Socket_Fd) {
+class Efl.Net.Socket_Udp extends Efl.Net.Socket_Fd {
     [[A base UDP socket.
 
       This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_unix.eo b/src/lib/ecore_con/efl_net_socket_unix.eo
index 9befbea..854130e 100644
--- a/src/lib/ecore_con/efl_net_socket_unix.eo
+++ b/src/lib/ecore_con/efl_net_socket_unix.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Unix (Efl.Net.Socket_Fd) {
+class Efl.Net.Socket_Unix extends Efl.Net.Socket_Fd {
     [[A base UNIX socket.
 
       This is the common class and takes an existing FD, usually
diff --git a/src/lib/ecore_con/efl_net_socket_windows.eo b/src/lib/ecore_con/efl_net_socket_windows.eo
index 95cdea6..f1e1625 100644
--- a/src/lib/ecore_con/efl_net_socket_windows.eo
+++ b/src/lib/ecore_con/efl_net_socket_windows.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Socket_Windows (Efl.Loop_Consumer, Efl.Net.Socket) {
+class Efl.Net.Socket_Windows extends Efl.Loop_Consumer implements Efl.Net.Socket {
     [[A base Windows NamedPipe socket.
 
       This is the common class and takes an existing file HANDLE,
diff --git a/src/lib/ecore_con/efl_net_ssl_context.eo b/src/lib/ecore_con/efl_net_ssl_context.eo
index bf69467..c19fe19 100644
--- a/src/lib/ecore_con/efl_net_ssl_context.eo
+++ b/src/lib/ecore_con/efl_net_ssl_context.eo
@@ -1,6 +1,6 @@
 import efl_net_ssl_types;
 
-class Efl.Net.Ssl.Context (Efl.Object) {
+class Efl.Net.Ssl.Context extends Efl.Object {
     [[A SSL Context that is used to start a SSL socket wrapper.
 
       The context will contain common configurations such as
diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo
index f389a23..03d7e49 100644
--- a/src/lib/ector/cairo/ector_cairo_software_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo
@@ -1,4 +1,4 @@
-class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.Base)
+class Ector.Cairo.Software.Surface extends Ector.Cairo.Surface implements Ector.Software.Buffer.Base
 {
    [[Ector surface on a cairo software backend
 
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo b/src/lib/ector/cairo/ector_cairo_surface.eo
index 76f2c82..f267a23 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -1,6 +1,6 @@
 struct @extern cairo_t; [[cairo_t type]]
 
-class Ector.Cairo.Surface (Efl.Object, Ector.Surface)
+class Ector.Cairo.Surface extends Efl.Object implements Ector.Surface
 {
    [[Ector surface on a cairo backend
 
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
index 948792a..28f267f 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Cairo.Gradient.Linear (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path)
+class Ector.Renderer.Cairo.Gradient.Linear extends Ector.Renderer.Cairo implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path
 {
    [[Ector cairo renderer gradient linear]]
    eo_prefix: ector_renderer_cairo_gradient_linear;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
index afcd441..144019d 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Cairo.Gradient.Radial (Ector.Renderer.Cairo, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path)
+class Ector.Renderer.Cairo.Gradient.Radial extends Ector.Renderer.Cairo implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path
 {
    [[Ector cairo renderer gradient radial]]
    eo_prefix: ector_renderer_cairo_gradient_radial;
diff --git a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
index 7c95844..336d469 100644
--- a/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
+++ b/src/lib/ector/cairo/ector_renderer_cairo_shape.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Cairo.Shape (Ector.Renderer.Cairo, Ector.Renderer.Shape, Efl.Gfx.Path)
+class Ector.Renderer.Cairo.Shape extends Ector.Renderer.Cairo implements Ector.Renderer.Shape, Efl.Gfx.Path
 {
    [[Ector cairo renderer shape class]]
    eo_prefix: ector_renderer_cairo_shape;
diff --git a/src/lib/ector/gl/ector_gl_surface.eo b/src/lib/ector/gl/ector_gl_surface.eo
index 034a27a..37dc43f 100644
--- a/src/lib/ector/gl/ector_gl_surface.eo
+++ b/src/lib/ector/gl/ector_gl_surface.eo
@@ -1,6 +1,6 @@
 import ector_types;
 
-class Ector.GL.Surface (Ector.GL.Buffer, Ector.Surface)
+class Ector.GL.Surface extends Ector.GL.Buffer implements Ector.Surface
 {
    [[Ector GL surface class]]
    eo_prefix: ector_gl_surface;
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
index 0623a8e..5971664 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.GL.Gradient.Linear (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path)
+class Ector.Renderer.GL.Gradient.Linear extends Ector.Renderer.GL implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear, Efl.Gfx.Path
 {
    [[Ector GL renderer gradient linear]]
    eo_prefix: ector_renderer_gl_gradient_linear;
diff --git a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
index 954ecbc..3f4154f 100644
--- a/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.GL.Gradient.Radial (Ector.Renderer.GL, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path)
+class Ector.Renderer.GL.Gradient.Radial extends Ector.Renderer.GL implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial, Efl.Gfx.Path
 {
    [[Ector GL renderer gradient radial]]
    eo_prefix: ector_renderer_gl_gradient_radial;
diff --git a/src/lib/ector/gl/ector_renderer_gl_shape.eo b/src/lib/ector/gl/ector_renderer_gl_shape.eo
index 6323ef6..608581b 100644
--- a/src/lib/ector/gl/ector_renderer_gl_shape.eo
+++ b/src/lib/ector/gl/ector_renderer_gl_shape.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.GL.Shape (Ector.Renderer.GL, Ector.Renderer.Shape, Efl.Gfx.Path)
+class Ector.Renderer.GL.Shape extends Ector.Renderer.GL implements Ector.Renderer.Shape, Efl.Gfx.Path
 {
    [[Ector GL renderer shape class]]
    eo_prefix: ector_renderer_gl_shape;
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
index 5cc4bdf..f2705dd 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_linear.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Software.Gradient.Linear (Ector.Renderer.Software, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear)
+class Ector.Renderer.Software.Gradient.Linear extends Ector.Renderer.Software implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Linear
 {
    [[Ector software renderer gradient linear class]]
    eo_prefix: ector_renderer_software_gradient_linear;
diff --git a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
index f05ea41..03bde1e 100644
--- a/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
+++ b/src/lib/ector/software/ector_renderer_software_gradient_radial.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Software.Gradient.Radial (Ector.Renderer.Software, Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial)
+class Ector.Renderer.Software.Gradient.Radial extends Ector.Renderer.Software implements Ector.Renderer.Gradient, Ector.Renderer.Gradient.Radial
 {
    [[Ector software renderer gradient radial]]
    eo_prefix: ector_renderer_software_gradient_radial;
diff --git a/src/lib/ector/software/ector_renderer_software_shape.eo b/src/lib/ector/software/ector_renderer_software_shape.eo
index 04f19ba..b4889b3 100644
--- a/src/lib/ector/software/ector_renderer_software_shape.eo
+++ b/src/lib/ector/software/ector_renderer_software_shape.eo
@@ -1,4 +1,4 @@
-class Ector.Renderer.Software.Shape (Ector.Renderer.Software, Ector.Renderer.Shape)
+class Ector.Renderer.Software.Shape extends Ector.Renderer.Software implements Ector.Renderer.Shape
 {
    [[Ector software renderer shape class]]
    eo_prefix: ector_renderer_software_shape;
diff --git a/src/lib/ector/software/ector_software_buffer.eo b/src/lib/ector/software/ector_software_buffer.eo
index 7d7eb82..76c3987 100644
--- a/src/lib/ector/software/ector_software_buffer.eo
+++ b/src/lib/ector/software/ector_software_buffer.eo
@@ -1,4 +1,4 @@
-class Ector.Software.Buffer (Efl.Object, Ector.Software.Buffer.Base)
+class Ector.Software.Buffer extends Efl.Object implements Ector.Software.Buffer.Base
 {
    [[Ector software buffer class]]
    data: null;
diff --git a/src/lib/ector/software/ector_software_surface.eo b/src/lib/ector/software/ector_software_surface.eo
index 2d03339..65d807a 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -1,4 +1,4 @@
-class Ector.Software.Surface (Ector.Software.Buffer, Ector.Surface)
+class Ector.Software.Surface extends Ector.Software.Buffer implements Ector.Surface
 {
    [[Ector surface software class]]
    eo_prefix: ector_software_surface;
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index 1f225ae..a7bb40a 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -1,7 +1,7 @@
-class Edje.Edit (Efl.Canvas.Layout)
+class Edje.Edit extends Efl.Canvas.Layout
 {
    [[Edje editing class to access edje object internals.
-   
+
    This was intended ONLY for use in an actual edje editor program. Unless
    you are writing one of these, do NOT use this API here.
    ]]
diff --git a/src/lib/edje/edje_global.eo b/src/lib/edje/edje_global.eo
index f5001f2..bff48e2 100644
--- a/src/lib/edje/edje_global.eo
+++ b/src/lib/edje/edje_global.eo
@@ -1,4 +1,4 @@
-class Edje.Global (Efl.Object, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, Efl.Gfx.Size_Class)
+class Edje.Global extends Efl.Object implements Efl.Gfx.Color_Class, Efl.Gfx.Text_Class, Efl.Gfx.Size_Class
 {
    [[An internal object that manages global color, text and size classes for
      the whole application. Individual edje objects also support the same
diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo
index 5feac56..f607e81 100644
--- a/src/lib/edje/efl_canvas_layout.eo
+++ b/src/lib/edje/efl_canvas_layout.eo
@@ -1,10 +1,10 @@
 // FIXME: This EO doc needs a direct link to the "edcref" doc
 
-class Efl.Canvas.Layout (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
+class Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl.Container, Efl.Part,
                          Efl.Observer, Efl.Layout.Calc,
                          Efl.Layout.Signal, Efl.Layout.Group,
                          Efl.Player, Efl.Gfx.Color_Class, Efl.Gfx.Text_Class,
-                         Efl.Gfx.Size_Class)
+                         Efl.Gfx.Size_Class
 {
    [[Edje object class]]
    legacy_prefix: edje_object;
diff --git a/src/lib/edje/efl_canvas_layout_part.eo b/src/lib/edje/efl_canvas_layout_part.eo
index c96e9a7..927e70a 100644
--- a/src/lib/edje/efl_canvas_layout_part.eo
+++ b/src/lib/edje/efl_canvas_layout_part.eo
@@ -1,6 +1,6 @@
 import edje_types;
 
-class Efl.Canvas.Layout_Part (Efl.Object, Efl.Gfx.Entity, Efl.Ui.Drag)
+class Efl.Canvas.Layout_Part extends Efl.Object implements Efl.Gfx.Entity, Efl.Ui.Drag
 {
    [[Common class for part proxy objects for @Efl.Canvas.Layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_box.eo b/src/lib/edje/efl_canvas_layout_part_box.eo
index 02be070..0173bab 100644
--- a/src/lib/edje/efl_canvas_layout_part_box.eo
+++ b/src/lib/edje/efl_canvas_layout_part_box.eo
@@ -1,5 +1,5 @@
-class Efl.Canvas.Layout_Part_Box (Efl.Canvas.Layout_Part, Efl.Pack_Linear,
-                                  Efl.Ui.Direction)
+class Efl.Canvas.Layout_Part_Box extends Efl.Canvas.Layout_Part implements Efl.Pack_Linear,
+                                  Efl.Ui.Direction
 {
    [[Represents a Box created as part of a layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_external.eo b/src/lib/edje/efl_canvas_layout_part_external.eo
index 4a80b1c..25e694c 100644
--- a/src/lib/edje/efl_canvas_layout_part_external.eo
+++ b/src/lib/edje/efl_canvas_layout_part_external.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_External (Efl.Canvas.Layout_Part, Efl.Content)
+class Efl.Canvas.Layout_Part_External extends Efl.Canvas.Layout_Part implements Efl.Content
 {
    [[Class representing an external part in Edje layouts.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_invalid.eo b/src/lib/edje/efl_canvas_layout_part_invalid.eo
index e4b10b9..ceb3177 100644
--- a/src/lib/edje/efl_canvas_layout_part_invalid.eo
+++ b/src/lib/edje/efl_canvas_layout_part_invalid.eo
@@ -1,7 +1,7 @@
-class Efl.Canvas.Layout_Part_Invalid (Efl.Canvas.Layout_Part, Efl.Content,
+class Efl.Canvas.Layout_Part_Invalid extends Efl.Canvas.Layout_Part implements Efl.Content,
                                       Efl.Pack_Linear, Efl.Ui.Direction,
                                       Efl.Pack_Table, Efl.Text,
-                                      Efl.Text_Markup)
+                                      Efl.Text_Markup
 {
    [[Common class for part proxy objects for @Efl.Canvas.Layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_swallow.eo b/src/lib/edje/efl_canvas_layout_part_swallow.eo
index 32634e8..6b1c472 100644
--- a/src/lib/edje/efl_canvas_layout_part_swallow.eo
+++ b/src/lib/edje/efl_canvas_layout_part_swallow.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Swallow (Efl.Canvas.Layout_Part, Efl.Content)
+class Efl.Canvas.Layout_Part_Swallow extends Efl.Canvas.Layout_Part implements Efl.Content
 {
    [[Represents a SWALLOW part of an Edje object.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_table.eo b/src/lib/edje/efl_canvas_layout_part_table.eo
index 8774385..e018438 100644
--- a/src/lib/edje/efl_canvas_layout_part_table.eo
+++ b/src/lib/edje/efl_canvas_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Layout_Part_Table (Efl.Canvas.Layout_Part, Efl.Pack_Table)
+class Efl.Canvas.Layout_Part_Table extends Efl.Canvas.Layout_Part implements Efl.Pack_Table
 {
    [[Represents a Table created as part of a layout.
 
diff --git a/src/lib/edje/efl_canvas_layout_part_text.eo b/src/lib/edje/efl_canvas_layout_part_text.eo
index 389c6bc..0546118 100644
--- a/src/lib/edje/efl_canvas_layout_part_text.eo
+++ b/src/lib/edje/efl_canvas_layout_part_text.eo
@@ -10,8 +10,8 @@ enum Efl.Canvas.Layout_Part_Text_Expand
    max_y  = 1 << 3,
 }
 
-class Efl.Canvas.Layout_Part_Text (Efl.Canvas.Layout_Part, Efl.Text,
-Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style)
+class Efl.Canvas.Layout_Part_Text extends Efl.Canvas.Layout_Part implements Efl.Text,
+Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style
 {
    [[Represents a TEXT part of a layout
 
@@ -25,7 +25,7 @@ Efl.Text_Markup, Efl.Text_Format, Efl.Text_Font, Efl.Text_Style)
             This will determine whether to consider height or width
             constraints, if text-specific behaviors occur (such as ellipsis,
             line-wrapping etc.
-           ]]  
+           ]]
            values {
               type: Efl.Canvas.Layout_Part_Text_Expand;
            }
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index e6c9898..91a0760 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -19,7 +19,7 @@ enum Efl.Input.Device_Type
   @property canvas { values { canvas: Efl.Canvas; } }
 */
 
-class Efl.Input.Device (Efl.Object)
+class Efl.Input.Device extends Efl.Object
 {
    [[Represents a pointing device such as a touch finger, pen or mouse.
 
diff --git a/src/lib/efl/interfaces/efl_io_buffer.eo b/src/lib/efl/interfaces/efl_io_buffer.eo
index b7d90d6..230c2aa 100644
--- a/src/lib/efl/interfaces/efl_io_buffer.eo
+++ b/src/lib/efl/interfaces/efl_io_buffer.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Buffer (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Io.Sizer, Efl.Io.Positioner) {
+class Efl.Io.Buffer extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Efl.Io.Sizer, Efl.Io.Positioner {
     [[Generic In-memory buffer of data to be used as I/O.
 
       This class offers both input and output, which can be used at
diff --git a/src/lib/efl/interfaces/efl_io_queue.eo b/src/lib/efl/interfaces/efl_io_queue.eo
index ae29827..c8c6f1e 100644
--- a/src/lib/efl/interfaces/efl_io_queue.eo
+++ b/src/lib/efl/interfaces/efl_io_queue.eo
@@ -1,4 +1,4 @@
-class Efl.Io.Queue (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) {
+class Efl.Io.Queue extends Efl.Object implements Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer {
     [[Generic In-memory queue of data to be used as I/O.
 
       This class is to be used to receive temporary data using
diff --git a/src/lib/efl/interfaces/efl_observable.eo b/src/lib/efl/interfaces/efl_observable.eo
index f39d3dc..4055217 100644
--- a/src/lib/efl/interfaces/efl_observable.eo
+++ b/src/lib/efl/interfaces/efl_observable.eo
@@ -1,6 +1,6 @@
 import efl_types;
 
-class Efl.Observable (Efl.Object) {
+class Efl.Observable extends Efl.Object {
    [[Efl observable class]]
    methods {
       observer_add {
@@ -38,7 +38,7 @@ class Efl.Observable (Efl.Object) {
          [[Return a new iterator associated with a group of observers.
 
            @since 1.19]]
-         return: iterator<Efl.Observer> @owned; [[Iterator for observers group]] 
+         return: iterator<Efl.Observer> @owned; [[Iterator for observers group]]
          params {
             @in key: string; [[A key to classify observer groups]]
          }
diff --git a/src/lib/efl/interfaces/efl_text_markup_util.eo b/src/lib/efl/interfaces/efl_text_markup_util.eo
index eb64791..845694d 100644
--- a/src/lib/efl/interfaces/efl_text_markup_util.eo
+++ b/src/lib/efl/interfaces/efl_text_markup_util.eo
@@ -1,4 +1,4 @@
-class Efl.Text_Markup_Util () {
+class Efl.Text_Markup_Util {
    [[Utility class for markup, such as conversions
 
      @since 1.21.
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index 5c8bffb..9ac9e63 100644
--- a/src/lib/eio/efl_io_manager.eo
+++ b/src/lib/eio/efl_io_manager.eo
@@ -21,7 +21,7 @@ function EflIoDirectInfo {
   }
 };
 
-class Efl.Io.Manager (Efl.Loop_Consumer)
+class Efl.Io.Manager extends Efl.Loop_Consumer
 {
   [[Class representing an asynchronous file operation.]]
 
diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo
index 8ba45ee..c8776ff 100644
--- a/src/lib/eio/eio_model.eo
+++ b/src/lib/eio/eio_model.eo
@@ -9,7 +9,7 @@ function EflIoFilter {
   return: int;
 };
 
-class Eio.Model (Efl.Model_Loop)
+class Eio.Model extends Efl.Model_Loop
 {
     [[Eio model class]]
 
diff --git a/src/lib/eio/eio_sentry.eo b/src/lib/eio/eio_sentry.eo
index 7dbebbc..bd0d19a 100644
--- a/src/lib/eio/eio_sentry.eo
+++ b/src/lib/eio/eio_sentry.eo
@@ -5,7 +5,7 @@ struct Eio.Sentry.Event
   source: string; [[The original monitored path.]]
 }
 
-class Eio.Sentry (Efl.Object)
+class Eio.Sentry extends Efl.Object
 {
   [[Monitors files and directories for changes.]]
 
diff --git a/src/lib/eldbus/eldbus_model.eo b/src/lib/eldbus/eldbus_model.eo
index 546e478..743808b 100644
--- a/src/lib/eldbus/eldbus_model.eo
+++ b/src/lib/eldbus/eldbus_model.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model (Efl.Model_Loop) {
+class Eldbus.Model extends Efl.Model_Loop {
     methods {
         connect {
             [[Define connection parameters.
@@ -59,4 +59,4 @@ class Eldbus.Model (Efl.Model_Loop) {
         .connect;
         .connection;
     }
-}
\ No newline at end of file
+}
diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo
index 262d782..2eb37d0 100644
--- a/src/lib/eldbus/eldbus_model_arguments.eo
+++ b/src/lib/eldbus/eldbus_model_arguments.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Arguments (Eldbus.Model) {
+class Eldbus.Model.Arguments extends Eldbus.Model {
     [[Eldbus model arguments class]]
 
     methods {
diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo
index d064027..499dfa4 100644
--- a/src/lib/eldbus/eldbus_model_connection.eo
+++ b/src/lib/eldbus/eldbus_model_connection.eo
@@ -1,4 +1,4 @@
-class Eldbus.Model.Connection (Eldbus.Model) {
+class Eldbus.Model.Connection extends Eldbus.Model {
     [[Eldbus model connection class]]
 
     implements {
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index ae74f80..66ef3e6 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Method (Eldbus.Model.Arguments) {
+class Eldbus.Model.Method extends Eldbus.Model.Arguments {
     [[Eldbus model method class]]
     methods {
         @property proxy {
diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo
index 2931621..d5827c5 100644
--- a/src/lib/eldbus/eldbus_model_object.eo
+++ b/src/lib/eldbus/eldbus_model_object.eo
@@ -1,4 +1,4 @@
-class Eldbus.Model.Object (Eldbus.Model) {
+class Eldbus.Model.Object extends Eldbus.Model {
     [[Eldbus model object class]]
 
     data: Eldbus_Model_Object_Data;
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index 0bb8b3e..3c8fe5b 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -1,6 +1,6 @@
 import eldbus_types;
 
-class Eldbus.Model.Proxy (Eldbus.Model) {
+class Eldbus.Model.Proxy extends Eldbus.Model {
     [[Eldbus model proxy class]]
 
     methods {
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 4aa547c..6ea877a 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -1,4 +1,4 @@
-class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
+class Eldbus.Model.Signal extends Eldbus.Model.Arguments {
     [[Eldbus model signal class]]
 
     methods {
diff --git a/src/lib/elementary/efl_config_global.eo b/src/lib/elementary/efl_config_global.eo
index a189b93..aba9ade 100644
--- a/src/lib/elementary/efl_config_global.eo
+++ b/src/lib/elementary/efl_config_global.eo
@@ -1,4 +1,4 @@
-class Efl.Config_Global (Efl.Object, Efl.Config)
+class Efl.Config_Global extends Efl.Object implements Efl.Config
 {
    [[This class is a singleton representing the global configuration for the
      running application.
diff --git a/src/lib/elementary/efl_datetime_manager.eo b/src/lib/elementary/efl_datetime_manager.eo
index 0728dc7..194c6bd 100644
--- a/src/lib/elementary/efl_datetime_manager.eo
+++ b/src/lib/elementary/efl_datetime_manager.eo
@@ -1,12 +1,12 @@
 import efl_types;
 
-class Efl.Datetime.Manager (Efl.Object)
+class Efl.Datetime.Manager extends Efl.Object
 {
    [[Efl datetime manager class for Datepicker and Timepicker]]
    methods {
       @property value {
          [[The value of a date, time for Datepicker or Timepicker.
-            
+
            The value for Datepicker contains year, month, and day. (tm_year, tm_mon, and tm_mday in Efl_Time)
            The value for Timepicker contains hour, and min. (tm_hour, and tm_min in Efl_Time)
          ]]
@@ -20,7 +20,7 @@ class Efl.Datetime.Manager (Efl.Object)
       }
       @property format {
          [[The format of date or time.
-                    
+
            Default format is taken as per the system locale settings.
          ]]
          set {
diff --git a/src/lib/elementary/efl_page_indicator.eo b/src/lib/elementary/efl_page_indicator.eo
index 110c4be..a360243 100644
--- a/src/lib/elementary/efl_page_indicator.eo
+++ b/src/lib/elementary/efl_page_indicator.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Indicator (Efl.Object)
+class Efl.Page.Indicator extends Efl.Object
 {
    [[Page indicator
 
diff --git a/src/lib/elementary/efl_page_indicator_icon.eo b/src/lib/elementary/efl_page_indicator_icon.eo
index 6a46d80..c56ae14 100644
--- a/src/lib/elementary/efl_page_indicator_icon.eo
+++ b/src/lib/elementary/efl_page_indicator_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Indicator_Icon (Efl.Page.Indicator)
+class Efl.Page.Indicator_Icon extends Efl.Page.Indicator
 {
    [[Icon type page indicator
 
diff --git a/src/lib/elementary/efl_page_transition.eo b/src/lib/elementary/efl_page_transition.eo
index 77e359c..bf67b7e 100644
--- a/src/lib/elementary/efl_page_transition.eo
+++ b/src/lib/elementary/efl_page_transition.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Transition (Efl.Object)
+class Efl.Page.Transition extends Efl.Object
 {
    [[Page transition for @Efl.Ui.Pager
 
diff --git a/src/lib/elementary/efl_page_transition_scroll.eo b/src/lib/elementary/efl_page_transition_scroll.eo
index 6c720c5..2575a50 100644
--- a/src/lib/elementary/efl_page_transition_scroll.eo
+++ b/src/lib/elementary/efl_page_transition_scroll.eo
@@ -1,4 +1,4 @@
-class Efl.Page.Transition_Scroll (Efl.Page.Transition)
+class Efl.Page.Transition_Scroll extends Efl.Page.Transition
 {
    [[Page transition for @Efl.Ui.Pager
 
diff --git a/src/lib/elementary/efl_ui_alert_popup.eo b/src/lib/elementary/efl_ui_alert_popup.eo
index d54e289..fdcb6eb 100644
--- a/src/lib/elementary/efl_ui_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_alert_popup.eo
@@ -10,7 +10,7 @@ struct Efl.Ui.Alert_Popup_Button_Clicked_Event {
    button_type: Efl.Ui.Alert_Popup_Button; [[Clicked button type]]
 }
 
-class Efl.Ui.Alert_Popup(Efl.Ui.Popup)
+class Efl.Ui.Alert_Popup extends Efl.Ui.Popup
 {
    [[EFL UI Alert Popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_alert_popup_part.eo b/src/lib/elementary/efl_ui_alert_popup_part.eo
index da17167..41e00d0 100644
--- a/src/lib/elementary/efl_ui_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_alert_popup_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Alert_Popup_Part (Efl.Ui.Layout_Part_Text)
+class Efl.Ui.Alert_Popup_Part extends Efl.Ui.Layout_Part_Text
 {
    [[Efl UI Alert Popup internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_anchor_popup.eo b/src/lib/elementary/efl_ui_anchor_popup.eo
index 3238a70..1f8ab61 100644
--- a/src/lib/elementary/efl_ui_anchor_popup.eo
+++ b/src/lib/elementary/efl_ui_anchor_popup.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Anchor_Popup(Efl.Ui.Popup)
+class Efl.Ui.Anchor_Popup extends Efl.Ui.Popup
 {
    [[EFL UI Anchor Popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_bg.eo b/src/lib/elementary/efl_ui_bg.eo
index 71b8a7b..26b1643 100644
--- a/src/lib/elementary/efl_ui_bg.eo
+++ b/src/lib/elementary/efl_ui_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Bg (Efl.Ui.Layout, Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller)
+class Efl.Ui.Bg extends Efl.Ui.Layout implements Efl.Gfx.Color, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
 {
    [[The bg (background) widget is used for setting (solid) background decorations
    for a window (unless it has transparency enabled) or for any container object. It
diff --git a/src/lib/elementary/efl_ui_bg_legacy.eo b/src/lib/elementary/efl_ui_bg_legacy.eo
index 7460aaa..7ab9aab 100644
--- a/src/lib/elementary/efl_ui_bg_legacy.eo
+++ b/src/lib/elementary/efl_ui_bg_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Bg_Legacy (Efl.Ui.Bg, Efl.Ui.Legacy)
+class Efl.Ui.Bg_Legacy extends Efl.Ui.Bg implements Efl.Ui.Legacy
 {
    [[The bg (background) widget is used for setting (solid) background decorations
 
diff --git a/src/lib/elementary/efl_ui_box.eo b/src/lib/elementary/efl_ui_box.eo
index 90e31ef..76a546b 100644
--- a/src/lib/elementary/efl_ui_box.eo
+++ b/src/lib/elementary/efl_ui_box.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Box (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Pack_Layout,
-                  Efl.Ui.Direction)
+class Efl.Ui.Box extends Efl.Ui.Widget implements Efl.Pack_Linear, Efl.Pack_Layout,
+                  Efl.Ui.Direction
 {
    [[The box widget.
 
diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo
index f4543d7..82e5bdb 100644
--- a/src/lib/elementary/efl_ui_box_flow.eo
+++ b/src/lib/elementary/efl_ui_box_flow.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Flow (Efl.Ui.Box)
+class Efl.Ui.Box_Flow extends Efl.Ui.Box
 {
    [[A custom layout engine for @Efl.Ui.Box.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_box_stack.eo b/src/lib/elementary/efl_ui_box_stack.eo
index e4bbd5e..7d2ebfb 100644
--- a/src/lib/elementary/efl_ui_box_stack.eo
+++ b/src/lib/elementary/efl_ui_box_stack.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Box_Stack (Efl.Ui.Box)
+class Efl.Ui.Box_Stack extends Efl.Ui.Box
 {
    [[A custom layout engine for @Efl.Ui.Box that stacks items.
 
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index f8cff54..adb22ba 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,6 +1,6 @@
-class Efl.Ui.Button (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class Efl.Ui.Button extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
                      Efl.Text, Efl.Content,
-                     Efl.Access.Widget.Action)
+                     Efl.Access.Widget.Action
 {
    [[Push-button widget
 
diff --git a/src/lib/elementary/efl_ui_button_legacy.eo b/src/lib/elementary/efl_ui_button_legacy.eo
index bf01ef8..acb2c8d 100644
--- a/src/lib/elementary/efl_ui_button_legacy.eo
+++ b/src/lib/elementary/efl_ui_button_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy (Efl.Ui.Button, Efl.Ui.Legacy)
+class Efl.Ui.Button_Legacy extends Efl.Ui.Button implements Efl.Ui.Legacy
 {
    [[Push-button widget
 
diff --git a/src/lib/elementary/efl_ui_button_legacy_part.eo b/src/lib/elementary/efl_ui_button_legacy_part.eo
index ba66edf..baa0551 100644
--- a/src/lib/elementary/efl_ui_button_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_button_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button_Legacy_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Button_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Elementary button internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_caching_factory.eo b/src/lib/elementary/efl_ui_caching_factory.eo
index c894e2c..c7e2f2b 100644
--- a/src/lib/elementary/efl_ui_caching_factory.eo
+++ b/src/lib/elementary/efl_ui_caching_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Caching_Factory (Efl.Loop_Consumer, Efl.Ui.Factory)
+class Efl.Ui.Caching_Factory extends Efl.Loop_Consumer implements Efl.Ui.Factory
 {
    [[Efl Ui Factory that provides object caching.
 
diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo
index 649b653..78bc2b4 100644
--- a/src/lib/elementary/efl_ui_calendar.eo
+++ b/src/lib/elementary/efl_ui_calendar.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Calendar_Weekday
    last  [[Sentinel value to indicate last enum field during iteration]]
 }
 
-class Efl.Ui.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format)
+class Efl.Ui.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action, Efl.Ui.Format
 {
    [[Calendar widget
 
diff --git a/src/lib/elementary/efl_ui_calendar_item.eo b/src/lib/elementary/efl_ui_calendar_item.eo
index cccc17c..ad235e0 100644
--- a/src/lib/elementary/efl_ui_calendar_item.eo
+++ b/src/lib/elementary/efl_ui_calendar_item.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Calendar_Item (Efl.Object, Efl.Ui.Focus.Object)
+class Efl.Ui.Calendar_Item extends Efl.Object implements Efl.Ui.Focus.Object
 {
     [[EFL UI Calendar Item class]]
     methods {
diff --git a/src/lib/elementary/efl_ui_check.eo b/src/lib/elementary/efl_ui_check.eo
index ef0f76d..b6ea04f 100644
--- a/src/lib/elementary/efl_ui_check.eo
+++ b/src/lib/elementary/efl_ui_check.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check (Efl.Ui.Nstate, Efl.Access.Widget.Action)
+class Efl.Ui.Check extends Efl.Ui.Nstate implements Efl.Access.Widget.Action
 {
    [[Check widget
 
diff --git a/src/lib/elementary/efl_ui_check_legacy.eo b/src/lib/elementary/efl_ui_check_legacy.eo
index 5d311a5..9486bf6 100644
--- a/src/lib/elementary/efl_ui_check_legacy.eo
+++ b/src/lib/elementary/efl_ui_check_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy (Efl.Ui.Check, Efl.Ui.Legacy)
+class Efl.Ui.Check_Legacy extends Efl.Ui.Check implements Efl.Ui.Legacy
 {
    [[Check widget
 
diff --git a/src/lib/elementary/efl_ui_check_legacy_part.eo b/src/lib/elementary/efl_ui_check_legacy_part.eo
index 7907db9..b856f08 100644
--- a/src/lib/elementary/efl_ui_check_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_check_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Check_Legacy_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Check_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Elementary check internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 69e5f61..678b210 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -16,7 +16,7 @@ enum Efl.Ui.Clock_Type
    ampm    = 7, [[Indicates AM/PM field .]]
 }
 
-class Efl.Ui.Clock (Efl.Ui.Layout)
+class Efl.Ui.Clock extends Efl.Ui.Layout
 {
    [[Efl UI clock class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_clock_legacy.eo b/src/lib/elementary/efl_ui_clock_legacy.eo
index b152257..463af96 100644
--- a/src/lib/elementary/efl_ui_clock_legacy.eo
+++ b/src/lib/elementary/efl_ui_clock_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Clock_Legacy (Efl.Ui.Clock, Efl.Ui.Legacy)
+class Efl.Ui.Clock_Legacy extends Efl.Ui.Clock implements Efl.Ui.Legacy
 {
    [[Efl UI clock class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo
index 74a0876..81d9b16 100644
--- a/src/lib/elementary/efl_ui_datepicker.eo
+++ b/src/lib/elementary/efl_ui_datepicker.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Datepicker (Efl.Ui.Layout)
+class Efl.Ui.Datepicker extends Efl.Ui.Layout
 {
    [[Datepicker widget
 
diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo
index cf98ea6..f35701f 100644
--- a/src/lib/elementary/efl_ui_flip.eo
+++ b/src/lib/elementary/efl_ui_flip.eo
@@ -28,7 +28,7 @@ enum Efl.Ui.Flip_Interaction
    page [[Page interaction]]
 }
 
-class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear)
+class Efl.Ui.Flip extends Efl.Ui.Widget implements Efl.Pack_Linear
 {
    [[Efl UI flip class]]
    legacy_prefix: elm_flip;
diff --git a/src/lib/elementary/efl_ui_flip_legacy.eo b/src/lib/elementary/efl_ui_flip_legacy.eo
index 697c2d1..c19762f 100644
--- a/src/lib/elementary/efl_ui_flip_legacy.eo
+++ b/src/lib/elementary/efl_ui_flip_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Flip_Legacy (Efl.Ui.Flip, Efl.Ui.Legacy)
+class Efl.Ui.Flip_Legacy extends Efl.Ui.Flip implements Efl.Ui.Legacy
 {
    [[Efl UI flip class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_flip_part.eo b/src/lib/elementary/efl_ui_flip_part.eo
index 0d3d721..84c3b0f 100644
--- a/src/lib/elementary/efl_ui_flip_part.eo
+++ b/src/lib/elementary/efl_ui_flip_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Flip_Part (Efl.Ui.Widget_Part, Efl.Content)
+class Efl.Ui.Flip_Part extends Efl.Ui.Widget_Part implements Efl.Content
 {
    [[Efl UI flip internal class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_focus_composition_adapter.eo b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
index b9d26fd..bb4e81c 100644
--- a/src/lib/elementary/efl_ui_focus_composition_adapter.eo
+++ b/src/lib/elementary/efl_ui_focus_composition_adapter.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Composition_Adapter (Efl.Object, Efl.Ui.Focus.Object)
+class Efl.Ui.Focus.Composition_Adapter extends Efl.Object implements Efl.Ui.Focus.Object
 {
    [[EFL UI Focus Composition Adapter class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.eo b/src/lib/elementary/efl_ui_focus_manager_calc.eo
index 8bf3096..19212c7 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Manager_Calc (Efl.Object, Efl.Ui.Focus.Manager) {
+class Efl.Ui.Focus.Manager_Calc extends Efl.Object implements Efl.Ui.Focus.Manager {
     [[Calculates the directions of Efl.Ui.Focus.Direction
 
       Each registered item will get an other registered object in each
diff --git a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
index 3f89751..14f0f3a 100644
--- a/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
+++ b/src/lib/elementary/efl_ui_focus_manager_root_focus.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Manager_Root_Focus(Efl.Ui.Focus.Manager_Calc) {
+class Efl.Ui.Focus.Manager_Root_Focus extends Efl.Ui.Focus.Manager_Calc  {
   [[ This class ensures that the root is at least focusable, if nothing else is focusable]]
   methods {
      @property canvas_object {
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
index 4959fac..3bb6697 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_gen.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Parent_Provider_Gen(Efl.Object, Efl.Ui.Focus.Parent_Provider) {
+class Efl.Ui.Focus.Parent_Provider_Gen extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
    [[EFL UI Focus Parent Provider Gen class]]
    methods {
       @property content_item_map {
diff --git a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
index beaec44..d9d38b5 100644
--- a/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
+++ b/src/lib/elementary/efl_ui_focus_parent_provider_standard.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Parent_Provider_Standard(Efl.Object, Efl.Ui.Focus.Parent_Provider) {
+class Efl.Ui.Focus.Parent_Provider_Standard extends Efl.Object implements Efl.Ui.Focus.Parent_Provider {
    [[EFL UI Focus Parent Provider Standard Class]]
    implements {
       Efl.Ui.Focus.Parent_Provider.find_logical_parent;
diff --git a/src/lib/elementary/efl_ui_focus_util.eo b/src/lib/elementary/efl_ui_focus_util.eo
index fdf2708..4724dcc 100644
--- a/src/lib/elementary/efl_ui_focus_util.eo
+++ b/src/lib/elementary/efl_ui_focus_util.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Focus.Util(Efl.Object) {
+class Efl.Ui.Focus.Util extends Efl.Object  {
    [[EFL UI Focus Util class]]
    methods {
       focus @class {
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 62dbf6d..af6b592 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Frame (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
-                    Efl.Content)
+class Efl.Ui.Frame extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
+                    Efl.Content
 {
    [[Frame widget
 
diff --git a/src/lib/elementary/efl_ui_frame_legacy.eo b/src/lib/elementary/efl_ui_frame_legacy.eo
index 02393c5..fb21570 100644
--- a/src/lib/elementary/efl_ui_frame_legacy.eo
+++ b/src/lib/elementary/efl_ui_frame_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Frame_Legacy (Efl.Ui.Frame, Efl.Ui.Legacy)
+class Efl.Ui.Frame_Legacy extends Efl.Ui.Frame implements Efl.Ui.Legacy
 {
    [[Frame widget
 
diff --git a/src/lib/elementary/efl_ui_grid.eo b/src/lib/elementary/efl_ui_grid.eo
index 7f92c0d..3c846cc 100644
--- a/src/lib/elementary/efl_ui_grid.eo
+++ b/src/lib/elementary/efl_ui_grid.eo
@@ -1,13 +1,13 @@
 import efl_ui_grid_item;
 
-class Efl.Ui.Grid (Efl.Ui.Layout,
+class Efl.Ui.Grid extends Efl.Ui.Layout implements
                    Efl.Ui.Scrollable_Interactive,
                    Efl.Ui.Scrollbar,
                    Efl.Pack_Linear, Efl.Pack_Layout,
                    Efl.Ui.Direction,
                    Efl.Ui.Clickable,
                    Efl.Ui.Selectable,
-                   Efl.Ui.Multi_Selectable)
+                   Efl.Ui.Multi_Selectable
 {
    [[Simple grid widget with Pack interface.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_grid_default_item.eo b/src/lib/elementary/efl_ui_grid_default_item.eo
index 729234e..c0f5862 100644
--- a/src/lib/elementary/efl_ui_grid_default_item.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item.eo
@@ -1,9 +1,9 @@
 
-class Efl.Ui.Grid_Default_Item (Efl.Ui.Grid_Item,
+class Efl.Ui.Grid_Default_Item extends Efl.Ui.Grid_Item implements
                                 Efl.Text,
                                 Efl.Text_Markup,
                                 Efl.Ui.L10n,
-                                Efl.Content)
+                                Efl.Content
 {
    [[Grid Default Item class.
      This class need to be sub object of list widget.
diff --git a/src/lib/elementary/efl_ui_grid_default_item_part_end.eo b/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
index 486ccbd..66ebd2a 100644
--- a/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item_part_end.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Grid_Default_Item_Part_End (Efl.Ui.Layout_Part, Efl.Content)
+class Efl.Ui.Grid_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
 {
    [[Grid Default Item internal content of end part class]]
         data: null;
diff --git a/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo b/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
index 75436f6..4dede02 100644
--- a/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_grid_default_item_part_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Grid_Default_Item_Part_Icon (Efl.Ui.Layout_Part, Efl.Content)
+class Efl.Ui.Grid_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
 {
    [[Grid Default Item internal content of icon part class]]
         data: null;
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 94ed732..d512ad8 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -18,12 +18,12 @@ struct Efl.Ui.Image_Error
    open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
 }
 
-class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable,
+class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable,
                  Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
                  Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
                  Efl.Orientation,
                  Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Layout.Calc,
-                 Efl.Layout.Group, Efl.Layout.Signal)
+                 Efl.Layout.Group, Efl.Layout.Signal
 {
    [[ Efl UI image class]]
    event_prefix: efl_ui_image;
diff --git a/src/lib/elementary/efl_ui_image_factory.eo b/src/lib/elementary/efl_ui_image_factory.eo
index 66abdf4..2b5c97e 100644
--- a/src/lib/elementary/efl_ui_image_factory.eo
+++ b/src/lib/elementary/efl_ui_image_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Factory (Efl.Ui.Caching_Factory)
+class Efl.Ui.Image_Factory extends Efl.Ui.Caching_Factory
 {
    [[Efl UI image factory class]]
    implements {
diff --git a/src/lib/elementary/efl_ui_image_legacy.eo b/src/lib/elementary/efl_ui_image_legacy.eo
index 0ee7309..15a3005 100644
--- a/src/lib/elementary/efl_ui_image_legacy.eo
+++ b/src/lib/elementary/efl_ui_image_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Legacy (Efl.Ui.Image, Efl.Ui.Legacy)
+class Efl.Ui.Image_Legacy extends Efl.Ui.Image implements Efl.Ui.Legacy
 {
    [[ Efl UI image class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 1baeff1..8aa7956 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -2,9 +2,9 @@
 struct @extern Elm.Photocam.Error;
 struct @extern Elm.Photocam.Progress;
 
-class Efl.Ui.Image_Zoomable (Efl.Ui.Image, Efl.Ui.Zoom,
+class Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
                              Efl.Ui.Scrollable_Interactive,
-                             Efl.Ui.Scrollbar)
+                             Efl.Ui.Scrollbar
 {
    [[Elementary Image Zoomable class]]
    legacy_prefix: elm_photocam;
diff --git a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo b/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
index 3816422..233d9ad 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Zoomable_Legacy (Efl.Ui.Image_Zoomable, Efl.Ui.Legacy)
+class Efl.Ui.Image_Zoomable_Legacy extends Efl.Ui.Image_Zoomable implements Efl.Ui.Legacy
 {
    [[Elementary Image Zoomable class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
index 0f48713..4cb307e 100644
--- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Image_Zoomable_Pan (Efl.Ui.Pan)
+class Efl.Ui.Image_Zoomable_Pan extends Efl.Ui.Pan
 {
    [[Elementary photocom pan class]]
    legacy_prefix: elm_photocam_pan;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index d303619..f350514 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Internal.Text.Interactive (Efl.Canvas.Text, Efl.Text_Interactive)
+class Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Text implements Efl.Text_Interactive
 {
    [[An internal object in charge of the interactive aspect of the text widget.
 
diff --git a/src/lib/elementary/efl_ui_internal_text_scroller.eo b/src/lib/elementary/efl_ui_internal_text_scroller.eo
index 47624e4..bc9b33e 100644
--- a/src/lib/elementary/efl_ui_internal_text_scroller.eo
+++ b/src/lib/elementary/efl_ui_internal_text_scroller.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Text_Scroller_Mode
    multiline = 1,
 }
 
-class Efl.Ui.Internal_Text_Scroller (Efl.Ui.Scroller)
+class Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
 {
    [[Internal-usage text scroller class.
 
diff --git a/src/lib/elementary/efl_ui_layout.eo b/src/lib/elementary/efl_ui_layout.eo
index e404af7..4bae691 100644
--- a/src/lib/elementary/efl_ui_layout.eo
+++ b/src/lib/elementary/efl_ui_layout.eo
@@ -1,9 +1,9 @@
 import efl_ui;
 
-class Efl.Ui.Layout (Efl.Ui.Widget, Efl.Container, Efl.File,
+class Efl.Ui.Layout extends Efl.Ui.Widget implements Efl.Container, Efl.File,
                      Efl.Ui.View, Efl.Ui.Model.Connect, Efl.Ui.Factory,
                      Efl.Layout.Calc, Efl.Layout.Signal,
-                     Efl.Layout.Group)
+                     Efl.Layout.Group
 {
    [[Elementary layout class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_layout_factory.eo b/src/lib/elementary/efl_ui_layout_factory.eo
index 8b9c06b..ea71e89 100644
--- a/src/lib/elementary/efl_ui_layout_factory.eo
+++ b/src/lib/elementary/efl_ui_layout_factory.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Factory (Efl.Ui.Caching_Factory)
+class Efl.Ui.Layout_Factory extends Efl.Ui.Caching_Factory
 {
    [[Efl Ui Layout Factory class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_layout_legacy.eo b/src/lib/elementary/efl_ui_layout_legacy.eo
index e444e4d..ca16e60 100644
--- a/src/lib/elementary/efl_ui_layout_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Legacy (Efl.Ui.Layout, Efl.Ui.Legacy)
+class Efl.Ui.Layout_Legacy extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
    [[Elementary layout class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part.eo b/src/lib/elementary/efl_ui_layout_part.eo
index 0a3f84b..9dad61e 100644
--- a/src/lib/elementary/efl_ui_layout_part.eo
+++ b/src/lib/elementary/efl_ui_layout_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part (Efl.Ui.Widget_Part, Efl.Ui.Cursor)
+class Efl.Ui.Layout_Part extends Efl.Ui.Widget_Part implements Efl.Ui.Cursor
 {
    [[Elementary layout internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_bg.eo b/src/lib/elementary/efl_ui_layout_part_bg.eo
index 372099e..dff060f 100644
--- a/src/lib/elementary/efl_ui_layout_part_bg.eo
+++ b/src/lib/elementary/efl_ui_layout_part_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Bg (Efl.Ui.Widget_Part_Bg)
+class Efl.Ui.Layout_Part_Bg extends Efl.Ui.Widget_Part_Bg
 {
    [[Elementary layout internal part background class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_box.eo b/src/lib/elementary/efl_ui_layout_part_box.eo
index 575749a..59ecc64 100644
--- a/src/lib/elementary/efl_ui_layout_part_box.eo
+++ b/src/lib/elementary/efl_ui_layout_part_box.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Layout_Part_Box (Efl.Object, Efl.Pack_Linear,
-                              Efl.Ui.Direction)
+class Efl.Ui.Layout_Part_Box extends Efl.Object implements Efl.Pack_Linear,
+                              Efl.Ui.Direction
 {
    [[Represents a Box created as part of a layout.
 
diff --git a/src/lib/elementary/efl_ui_layout_part_content.eo b/src/lib/elementary/efl_ui_layout_part_content.eo
index 20284f2..c09d075 100644
--- a/src/lib/elementary/efl_ui_layout_part_content.eo
+++ b/src/lib/elementary/efl_ui_layout_part_content.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Content (Efl.Ui.Layout_Part, Efl.Content)
+class Efl.Ui.Layout_Part_Content extends Efl.Ui.Layout_Part implements Efl.Content
 {
    [[Elementary layout internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_legacy.eo b/src/lib/elementary/efl_ui_layout_part_legacy.eo
index 1ebd8ae..af6279e 100644
--- a/src/lib/elementary/efl_ui_layout_part_legacy.eo
+++ b/src/lib/elementary/efl_ui_layout_part_legacy.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Layout_Part_Legacy (Efl.Ui.Layout_Part, Efl.Content, Efl.Text,
-                                 Efl.Text_Markup, Efl.Ui.L10n)
+class Efl.Ui.Layout_Part_Legacy extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text,
+                                 Efl.Text_Markup, Efl.Ui.L10n
 {
    [[Elementary layout internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_layout_part_table.eo b/src/lib/elementary/efl_ui_layout_part_table.eo
index 660afa4..db6ce08 100644
--- a/src/lib/elementary/efl_ui_layout_part_table.eo
+++ b/src/lib/elementary/efl_ui_layout_part_table.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Layout_Part_Table (Efl.Object, Efl.Pack_Table)
+class Efl.Ui.Layout_Part_Table extends Efl.Object implements Efl.Pack_Table
 {
    [[Represents a Table created as part of a layout.
 
diff --git a/src/lib/elementary/efl_ui_layout_part_text.eo b/src/lib/elementary/efl_ui_layout_part_text.eo
index 166df84..0a092a2 100644
--- a/src/lib/elementary/efl_ui_layout_part_text.eo
+++ b/src/lib/elementary/efl_ui_layout_part_text.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Layout_Part_Text (Efl.Ui.Layout_Part, Efl.Text, Efl.Text_Markup,
-                               Efl.Ui.L10n)
+class Efl.Ui.Layout_Part_Text extends Efl.Ui.Layout_Part implements Efl.Text, Efl.Text_Markup,
+                               Efl.Ui.L10n
 {
    [[Elementary layout internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_list.eo b/src/lib/elementary/efl_ui_list.eo
index 00e60d6..5ccb5bd 100644
--- a/src/lib/elementary/efl_ui_list.eo
+++ b/src/lib/elementary/efl_ui_list.eo
@@ -1,12 +1,12 @@
 import efl_ui_list_item;
 
-class Efl.Ui.List (Efl.Ui.Layout,
+class Efl.Ui.List extends Efl.Ui.Layout implements
                    Efl.Ui.Scrollable_Interactive,
                    Efl.Ui.Scrollbar,
                    Efl.Pack_Linear, Efl.Pack_Layout,
                    Efl.Ui.Clickable,
                    Efl.Ui.Selectable,
-                   Efl.Ui.Multi_Selectable)
+                   Efl.Ui.Multi_Selectable
 {
    [[Simple list widget with Pack interface.]]
    methods {
diff --git a/src/lib/elementary/efl_ui_list_default_item.eo b/src/lib/elementary/efl_ui_list_default_item.eo
index 8e5948a..d4aca69 100644
--- a/src/lib/elementary/efl_ui_list_default_item.eo
+++ b/src/lib/elementary/efl_ui_list_default_item.eo
@@ -1,8 +1,8 @@
 
-class Efl.Ui.List_Default_Item (Efl.Ui.List_Item,
+class Efl.Ui.List_Default_Item extends Efl.Ui.List_Item implements
                                 Efl.Text,
                                 Efl.Text_Markup,
-                                Efl.Content)
+                                Efl.Content
 {
    [[List Default Item class.
      This class need to be sub object of list widget.
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_end.eo b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
index d149213..c7b51fb 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_end.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_end.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout_Part, Efl.Content)
+class Efl.Ui.List_Default_Item_Part_End extends Efl.Ui.Layout_Part implements Efl.Content
 {
    [[List Default Item internal content of end part class]]
         data: null;
@@ -6,4 +6,4 @@ class Efl.Ui.List_Default_Item_Part_End (Efl.Ui.Layout_Part, Efl.Content)
       Efl.Content.content { get; set; }
       Efl.Content.content_unset;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
index 319be19..ff0ec0e 100644
--- a/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
+++ b/src/lib/elementary/efl_ui_list_default_item_part_icon.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_Default_Item_Part_Icon (Efl.Ui.Layout_Part, Efl.Content)
+class Efl.Ui.List_Default_Item_Part_Icon extends Efl.Ui.Layout_Part implements Efl.Content
 {
    [[List Default Item internal content of icon part class]]
         data: null;
diff --git a/src/lib/elementary/efl_ui_list_empty_item.eo b/src/lib/elementary/efl_ui_list_empty_item.eo
index ad91107..9b3456d 100644
--- a/src/lib/elementary/efl_ui_list_empty_item.eo
+++ b/src/lib/elementary/efl_ui_list_empty_item.eo
@@ -1,5 +1,5 @@
 
-class Efl.Ui.List_Empty_Item (Efl.Ui.List_Item, Efl.Content)
+class Efl.Ui.List_Empty_Item extends Efl.Ui.List_Item implements Efl.Content
 {
    [[List Empty Item class. This item have only one swallow space,
      thus user can decorate item by filling the swallow with
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 971a018..83e403f 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -6,9 +6,9 @@ struct Efl.Ui.List_View_Item_Event
    child: Efl.Model;
    index: int;
 }
-class Efl.Ui.List_View (Efl.Ui.Layout, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
+class Efl.Ui.List_View extends Efl.Ui.Layout 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.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager)
+                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
 {
    methods {
       @property relayout {
diff --git a/src/lib/elementary/efl_ui_list_view_pan.eo b/src/lib/elementary/efl_ui_list_view_pan.eo
index 1253a88..e05cd09 100644
--- a/src/lib/elementary/efl_ui_list_view_pan.eo
+++ b/src/lib/elementary/efl_ui_list_view_pan.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_View_Pan (Efl.Ui.Pan)
+class Efl.Ui.List_View_Pan extends Efl.Ui.Pan
 {
    [[Elementary Efl_Ui_List_View pan class]]
    implements {
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.eo b/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
index 9100f69..52f4964 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.List_View_Precise_Layouter (Efl.Object, Efl.Ui.List_View_Relayout)
+class Efl.Ui.List_View_Precise_Layouter extends Efl.Object implements Efl.Ui.List_View_Relayout
 {
    implements {
       Efl.Object.constructor;
diff --git a/src/lib/elementary/efl_ui_list_view_seg_array.eo b/src/lib/elementary/efl_ui_list_view_seg_array.eo
index 197828e..228b417 100644
--- a/src/lib/elementary/efl_ui_list_view_seg_array.eo
+++ b/src/lib/elementary/efl_ui_list_view_seg_array.eo
@@ -1,6 +1,6 @@
 import efl_ui_list_view_types;
 
-class Efl.Ui.List_View_Seg_Array (Efl.Object)
+class Efl.Ui.List_View_Seg_Array extends Efl.Object
 {
    methods {
       @property accessor {
diff --git a/src/lib/elementary/efl_ui_model_state.eo b/src/lib/elementary/efl_ui_model_state.eo
index 3192df1..eb49aba 100644
--- a/src/lib/elementary/efl_ui_model_state.eo
+++ b/src/lib/elementary/efl_ui_model_state.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Model_State (Efl.Model_Composite_Boolean)
+class Efl.Ui.Model_State extends Efl.Model_Composite_Boolean
 {
    [[Efl model handling visibility, enable and selected state]]
    implements {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.eo b/src/lib/elementary/efl_ui_navigation_bar.eo
index 1a40249..15f4d92 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar (Efl.Ui.Layout, Efl.Content, Efl.Text)
+class Efl.Ui.Navigation_Bar extends Efl.Ui.Layout implements Efl.Content, Efl.Text
 {
    [[Navigation_Bar widget.
 
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part.eo b/src/lib/elementary/efl_ui_navigation_bar_part.eo
index 30f677f..c94b5a5 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Navigation_Bar_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Efl UI Navigation_Bar internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
index 21ebddb..43e3dd1 100644
--- a/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
+++ b/src/lib/elementary/efl_ui_navigation_bar_part_back_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Bar_Part_Back_Button (Efl.Ui.Layout_Part, Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content)
+class Efl.Ui.Navigation_Bar_Part_Back_Button extends Efl.Ui.Layout_Part implements Efl.Ui.Clickable, Efl.Gfx.Entity, Efl.Text, Efl.Content
 {
    [[Efl Ui Navigation_Bar internal part back button class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_navigation_layout.eo b/src/lib/elementary/efl_ui_navigation_layout.eo
index 846fbf6..51fe71f 100644
--- a/src/lib/elementary/efl_ui_navigation_layout.eo
+++ b/src/lib/elementary/efl_ui_navigation_layout.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Navigation_Layout (Efl.Ui.Layout, Efl.Content)
+class Efl.Ui.Navigation_Layout extends Efl.Ui.Layout implements Efl.Content
 {
    [[Navigation_Layout widget.
 
diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo
index 8c3f1de..31b29ac 100644
--- a/src/lib/elementary/efl_ui_nstate.eo
+++ b/src/lib/elementary/efl_ui_nstate.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Nstate(Efl.Ui.Button)
+class Efl.Ui.Nstate extends Efl.Ui.Button
 {
    [[Efl UI nstate class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_pager.eo b/src/lib/elementary/efl_ui_pager.eo
index 2f67cc7..4962f78 100644
--- a/src/lib/elementary/efl_ui_pager.eo
+++ b/src/lib/elementary/efl_ui_pager.eo
@@ -5,7 +5,7 @@ enum Efl.Ui.Pager_Loop
    enabled
 }
 
-class Efl.Ui.Pager (Efl.Ui.Layout, Efl.Pack_Linear)
+class Efl.Ui.Pager extends Efl.Ui.Layout implements Efl.Pack_Linear
 {
    [[Pager widget
 
diff --git a/src/lib/elementary/efl_ui_pan.eo b/src/lib/elementary/efl_ui_pan.eo
index b27b8ca..bd47b60 100644
--- a/src/lib/elementary/efl_ui_pan.eo
+++ b/src/lib/elementary/efl_ui_pan.eo
@@ -1,5 +1,4 @@
-class Efl.Ui.Pan (Efl.Canvas.Group,
-                  Efl.Content)
+class Efl.Ui.Pan extends Efl.Canvas.Group implements Efl.Content
 {
    [[Elementary pan class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index da28517..6d0bc5c 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -15,8 +15,8 @@ struct Efl.Ui.Panel_Scroll_Info
    rel_y: double; [[content scrolled position (0.0 ~ 1.0) in the panel]]
 }
 
-class Efl.Ui.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
-                    Efl.Access.Widget.Action)
+class Efl.Ui.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable, Efl.Content,
+                    Efl.Access.Widget.Action
 {
    [[Elementary panel class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index 62594f3..eb4d0c3 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Panes (Efl.Ui.Layout, Efl.Ui.Direction,
-                    Efl.Ui.Clickable)
+class Efl.Ui.Panes extends Efl.Ui.Layout implements Efl.Ui.Direction,
+                    Efl.Ui.Clickable
 {
    [[Elementary panes class]]
    legacy_prefix: elm_panes;
diff --git a/src/lib/elementary/efl_ui_panes_legacy.eo b/src/lib/elementary/efl_ui_panes_legacy.eo
index 704f709..28f9ca5 100644
--- a/src/lib/elementary/efl_ui_panes_legacy.eo
+++ b/src/lib/elementary/efl_ui_panes_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes_Legacy(Efl.Ui.Panes, Efl.Ui.Legacy)
+class Efl.Ui.Panes_Legacy extends Efl.Ui.Panes implements Efl.Ui.Legacy
 {
    [[Elementary panes class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_panes_part.eo b/src/lib/elementary/efl_ui_panes_part.eo
index f7b8001..4a96713 100644
--- a/src/lib/elementary/efl_ui_panes_part.eo
+++ b/src/lib/elementary/efl_ui_panes_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Panes_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Panes_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Elementary Panes internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo
index 16d8105..26d8597 100644
--- a/src/lib/elementary/efl_ui_popup.eo
+++ b/src/lib/elementary/efl_ui_popup.eo
@@ -8,7 +8,7 @@ enum Efl.Ui.Popup_Align {
     bottom    [[Popup aligned to bottom]]
 }
 
-class Efl.Ui.Popup(Efl.Ui.Layout, Efl.Content)
+class Efl.Ui.Popup extends Efl.Ui.Layout implements Efl.Content
 {
    [[EFL UI popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_popup_part_backwall.eo b/src/lib/elementary/efl_ui_popup_part_backwall.eo
index fc88747..124d27c 100644
--- a/src/lib/elementary/efl_ui_popup_part_backwall.eo
+++ b/src/lib/elementary/efl_ui_popup_part_backwall.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Popup_Part_Backwall (Efl.Ui.Layout_Part, Efl.File)
+class Efl.Ui.Popup_Part_Backwall extends Efl.Ui.Layout_Part implements Efl.File
 {
    [[Efl UI Popup internal part backwall class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 80e7caf..2222763 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,6 +1,6 @@
-class Efl.Ui.Progressbar (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
+class Efl.Ui.Progressbar extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Format,
                           Efl.Ui.Direction, Efl.Access.Value,
-                          Efl.Text, Efl.Content, Efl.Text_Markup)
+                          Efl.Text, Efl.Content, Efl.Text_Markup
 {
    [[Elementary progressbar class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy.eo b/src/lib/elementary/efl_ui_progressbar_legacy.eo
index b091225..a8361cf 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy (Efl.Ui.Progressbar, Efl.Ui.Legacy)
+class Efl.Ui.Progressbar_Legacy extends Efl.Ui.Progressbar implements Efl.Ui.Legacy
 {
    [[Elementary progressbar class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
index faffc05..fd989e5 100644
--- a/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Legacy_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Progressbar_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Elementary progressbar internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_progressbar_part.eo b/src/lib/elementary/efl_ui_progressbar_part.eo
index 1b68701..13924fc 100644
--- a/src/lib/elementary/efl_ui_progressbar_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar_Part (Efl.Ui.Layout_Part, Efl.Ui.Range)
+class Efl.Ui.Progressbar_Part extends Efl.Ui.Layout_Part implements Efl.Ui.Range
 {
    [[Elementary progressbar internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_radio.eo b/src/lib/elementary/efl_ui_radio.eo
index 44d3df9..c85d163 100644
--- a/src/lib/elementary/efl_ui_radio.eo
+++ b/src/lib/elementary/efl_ui_radio.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio (Efl.Ui.Check, Efl.Access.Widget.Action, Efl.Content)
+class Efl.Ui.Radio extends Efl.Ui.Check implements Efl.Access.Widget.Action, Efl.Content
 {
    [[Elementary radio class]]
    legacy_prefix: elm_radio;
diff --git a/src/lib/elementary/efl_ui_radio_legacy.eo b/src/lib/elementary/efl_ui_radio_legacy.eo
index cee114a..8089c48 100644
--- a/src/lib/elementary/efl_ui_radio_legacy.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy (Efl.Ui.Radio, Efl.Ui.Legacy)
+class Efl.Ui.Radio_Legacy extends Efl.Ui.Radio implements Efl.Ui.Legacy
 {
    [[Elementary radio class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_radio_legacy_part.eo b/src/lib/elementary/efl_ui_radio_legacy_part.eo
index ceca646..e7edcde 100644
--- a/src/lib/elementary/efl_ui_radio_legacy_part.eo
+++ b/src/lib/elementary/efl_ui_radio_legacy_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Radio_Legacy_Part (Efl.Ui.Layout_Part_Content)
+class Efl.Ui.Radio_Legacy_Part extends Efl.Ui.Layout_Part_Content
 {
    [[Elementary radio internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup.eo b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
index 5170627..fe4cf36 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Ui.Scroll_Alert_Popup(Efl.Ui.Alert_Popup)
+class Efl.Ui.Scroll_Alert_Popup extends Efl.Ui.Alert_Popup
 {
    [[EFL UI Scroll Alert Popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo b/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
index 06730a3..f100d02 100644
--- a/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_scroll_alert_popup_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Scroll_Alert_Popup_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
+class Efl.Ui.Scroll_Alert_Popup_Part extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text
 {
    [[Efl UI Scroll Alert Popup internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo
index 90cab82..c390e16 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.eo
+++ b/src/lib/elementary/efl_ui_scroll_manager.eo
@@ -1,7 +1,7 @@
-class Efl.Ui.Scroll.Manager (Efl.Object,
+class Efl.Ui.Scroll.Manager extends Efl.Object implements
                              Efl.Ui.I18n,
                              Efl.Ui.Scrollable_Interactive,
-                             Efl.Ui.Scrollbar)
+                             Efl.Ui.Scrollbar
 {
    [[Efl ui scroll manager class]]
    event_prefix: efl_ui;
@@ -9,7 +9,7 @@ class Efl.Ui.Scroll.Manager (Efl.Object,
    methods {
       @property pan @protected {
     [[This is the internal pan object managed by scroll manager.
-       
+
       This property is protected as it is meant for scrollable object
       implementations only, to set and access the internal pan object.
       If pan is set to NULL, scrolling does not work.
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index c037fe7..d7ad5d1 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -1,7 +1,7 @@
-class Efl.Ui.Scroller (Efl.Ui.Layout,
+class Efl.Ui.Scroller extends Efl.Ui.Layout implements
                        Efl.Ui.Scrollable_Interactive,
                        Efl.Ui.Scrollbar,
-                       Efl.Content)
+                       Efl.Content
 {
    [[Efl ui scroller class]]
    implements {
diff --git a/src/lib/elementary/efl_ui_selection_manager.eo b/src/lib/elementary/efl_ui_selection_manager.eo
index 893630a..50b5d5b 100644
--- a/src/lib/elementary/efl_ui_selection_manager.eo
+++ b/src/lib/elementary/efl_ui_selection_manager.eo
@@ -1,6 +1,6 @@
 import efl_ui_dnd_types;
 
-class Efl.Ui.Selection_Manager (Efl.Object) {
+class Efl.Ui.Selection_Manager extends Efl.Object {
    methods {
       selection_set @beta {
          [[Set selection]]
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 0fa7ad5..43bb166 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,7 +1,7 @@
-class Efl.Ui.Slider (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Direction,
+class Efl.Ui.Slider extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Direction,
                      Efl.Access.Value,
                      Efl.Access.Widget.Action,
-                     Efl.Content)
+                     Efl.Content
 {
    [[Elementary slider class]]
    legacy_prefix: null;
diff --git a/src/lib/elementary/efl_ui_slider_interval.eo b/src/lib/elementary/efl_ui_slider_interval.eo
index 15172dc..0a83389 100644
--- a/src/lib/elementary/efl_ui_slider_interval.eo
+++ b/src/lib/elementary/efl_ui_slider_interval.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Slider_Interval (Efl.Ui.Slider)
+class Efl.Ui.Slider_Interval extends Efl.Ui.Slider
 {
     [[An interval slider.
 
diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo
index 7bb4fa5..8ec81df 100644
--- a/src/lib/elementary/efl_ui_spin.eo
+++ b/src/lib/elementary/efl_ui_spin.eo
@@ -5,8 +5,8 @@ struct Efl.Ui.Spin_Special_Value
    label: string; [[String to replace]]
 }
 
-class Efl.Ui.Spin (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Format,
-                   Efl.Access.Value, Efl.Access.Widget.Action)
+class Efl.Ui.Spin extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Format,
+                   Efl.Access.Value, Efl.Access.Widget.Action
 {
    [[A Spin.
 
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 116fdd3..cd55741 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Ui.Direction,
-                          Efl.Access.Widget.Action)
+class Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Composition, Efl.Ui.Direction,
+                          Efl.Access.Widget.Action
 {
    [[A Button Spin.
 
diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo
index 86f4b84..57c8d70 100644
--- a/src/lib/elementary/efl_ui_stack.eo
+++ b/src/lib/elementary/efl_ui_stack.eo
@@ -18,10 +18,10 @@ struct Efl.Ui.Stack_Event_Deactivated {
    content: Efl.Canvas.Object; [[Deactivated content.]]
 }
 
-class Efl.Ui.Stack (Efl.Ui.Layout)
+class Efl.Ui.Stack extends Efl.Ui.Layout
 {
    [[Stack widget.
-           
+
      Stack widget arranges objects in stack structure by pushing and poping them.
    ]]
    methods {
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index 95c42c4..2fbdd4d 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Bar (Efl.Ui.Layout, Efl.Ui.Clickable)
+class Efl.Ui.Tab_Bar extends Efl.Ui.Layout implements Efl.Ui.Clickable
 {
    [[Tab Bar class]]
    methods {
@@ -40,4 +40,4 @@ class Efl.Ui.Tab_Bar (Efl.Ui.Layout, Efl.Ui.Clickable)
       Efl.Object.destructor;
       Efl.Ui.Widget.widget_event;
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/elementary/efl_ui_tab_page.eo b/src/lib/elementary/efl_ui_tab_page.eo
index f321d47..e5468dd 100644
--- a/src/lib/elementary/efl_ui_tab_page.eo
+++ b/src/lib/elementary/efl_ui_tab_page.eo
@@ -8,7 +8,7 @@ struct Efl.Ui.Tab_Page_Tab_Changed_Event {
    changed_info: Efl.Ui.Tab_Page_Tab_Changed;
 }
 
-class Efl.Ui.Tab_Page (Efl.Ui.Layout, Efl.Content)
+class Efl.Ui.Tab_Page extends Efl.Ui.Layout implements Efl.Content
 {
    [[Tab Page class]]
    methods {
@@ -25,4 +25,4 @@ class Efl.Ui.Tab_Page (Efl.Ui.Layout, Efl.Content)
    events {
       tab,changed: Efl.Ui.Tab_Page_Tab_Changed_Event; [[Called when tab changed]]
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/elementary/efl_ui_tab_page_part_tab.eo b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
index 74d3449..03626fc 100644
--- a/src/lib/elementary/efl_ui_tab_page_part_tab.eo
+++ b/src/lib/elementary/efl_ui_tab_page_part_tab.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout_Part, Efl.Text)
+class Efl.Ui.Tab_Page_Part_Tab extends Efl.Ui.Layout_Part implements Efl.Text
 {
    [[Tab_Page internal part class]]
    data: null;
@@ -12,4 +12,4 @@ class Efl.Ui.Tab_Page_Part_Tab (Efl.Ui.Layout_Part, Efl.Text)
    implements {
       Efl.Text.text { get; set; }
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/elementary/efl_ui_tab_pager.eo b/src/lib/elementary/efl_ui_tab_pager.eo
index ca46934..fa79b58 100644
--- a/src/lib/elementary/efl_ui_tab_pager.eo
+++ b/src/lib/elementary/efl_ui_tab_pager.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tab_Pager (Efl.Ui.Pager)
+class Efl.Ui.Tab_Pager extends Efl.Ui.Pager
 {
    [[Tab Pager class]]
    methods {
@@ -25,4 +25,4 @@ class Efl.Ui.Tab_Pager (Efl.Ui.Pager)
       Efl.Pack_Linear.pack_unpack_at;          // TODO
       Efl.Ui.Pager.current_page { set; }
    }
-}
\ No newline at end of file
+}
diff --git a/src/lib/elementary/efl_ui_table.eo b/src/lib/elementary/efl_ui_table.eo
index 03d1f98..35774f3 100644
--- a/src/lib/elementary/efl_ui_table.eo
+++ b/src/lib/elementary/efl_ui_table.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Table (Efl.Ui.Widget, Efl.Pack_Table, Efl.Pack_Layout,
-                   Efl.Ui.Direction)
+class Efl.Ui.Table extends Efl.Ui.Widget implements Efl.Pack_Table, Efl.Pack_Layout,
+                   Efl.Ui.Direction
 {
    [[Efl UI table class]]
    implements {
diff --git a/src/lib/elementary/efl_ui_table_static.eo b/src/lib/elementary/efl_ui_table_static.eo
index 966a5dd..12d39f3 100644
--- a/src/lib/elementary/efl_ui_table_static.eo
+++ b/src/lib/elementary/efl_ui_table_static.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Table_Static (Efl.Ui.Table)
+class Efl.Ui.Table_Static extends Efl.Ui.Table
 {
    [[Efl UI table static class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 256271a..05a9e12 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Tags (Efl.Ui.Layout, Efl.Text, Efl.Ui.Format)
+class Efl.Ui.Tags extends Efl.Ui.Layout implements Efl.Text, Efl.Ui.Format
 {
    [[Elementary Tags class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index 70bb878..4441f56 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,9 +1,9 @@
 /* FIXME - Text object must stop using elm_general! */
 import elm_general;
 
-class Efl.Ui.Text (Efl.Ui.Layout, Efl.Ui.Clickable,
+class Efl.Ui.Text extends Efl.Ui.Layout implements Efl.Ui.Clickable,
                  Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
-                 Efl.Ui.Selectable, Efl.Text_Interactive)
+                 Efl.Ui.Selectable, Efl.Text_Interactive
 {
    [[Efl UI text class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_text_alert_popup.eo b/src/lib/elementary/efl_ui_text_alert_popup.eo
index 32f66a8..fc52f8c 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup.eo
+++ b/src/lib/elementary/efl_ui_text_alert_popup.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Ui.Text_Alert_Popup(Efl.Ui.Alert_Popup, Efl.Text)
+class Efl.Ui.Text_Alert_Popup extends Efl.Ui.Alert_Popup implements Efl.Text
 {
    [[EFL UI Text Alert Popup class]]
    methods {
diff --git a/src/lib/elementary/efl_ui_text_alert_popup_part.eo b/src/lib/elementary/efl_ui_text_alert_popup_part.eo
index cf3f20f..c572dad 100644
--- a/src/lib/elementary/efl_ui_text_alert_popup_part.eo
+++ b/src/lib/elementary/efl_ui_text_alert_popup_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Alert_Popup_Part (Efl.Ui.Layout_Part, Efl.Content, Efl.Text)
+class Efl.Ui.Text_Alert_Popup_Part extends Efl.Ui.Layout_Part implements Efl.Content, Efl.Text
 {
    [[Efl UI Text Alert Popup internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_text_async.eo b/src/lib/elementary/efl_ui_text_async.eo
index 52061e5..9afc2ac 100644
--- a/src/lib/elementary/efl_ui_text_async.eo
+++ b/src/lib/elementary/efl_ui_text_async.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Async (Efl.Ui.Text)
+class Efl.Ui.Text_Async extends Efl.Ui.Text
 {
    [[Efl UI text async class
 
diff --git a/src/lib/elementary/efl_ui_text_editable.eo b/src/lib/elementary/efl_ui_text_editable.eo
index b0535b1..d025f01 100644
--- a/src/lib/elementary/efl_ui_text_editable.eo
+++ b/src/lib/elementary/efl_ui_text_editable.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Editable (Efl.Ui.Text)
+class Efl.Ui.Text_Editable extends Efl.Ui.Text
 {
    [[Efl UI text editable class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_text_factory_emoticons.eo b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
index 6cfcdbe..05d4618 100644
--- a/src/lib/elementary/efl_ui_text_factory_emoticons.eo
+++ b/src/lib/elementary/efl_ui_text_factory_emoticons.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Factory.Emoticons (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Text_Factory
 {
    [[Factory that creates emoticons from the current theme given a key.
 
diff --git a/src/lib/elementary/efl_ui_text_factory_fallback.eo b/src/lib/elementary/efl_ui_text_factory_fallback.eo
index 03b339d..8158c50 100644
--- a/src/lib/elementary/efl_ui_text_factory_fallback.eo
+++ b/src/lib/elementary/efl_ui_text_factory_fallback.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Factory.Fallback (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Text_Factory
 {
    [[Internal factory for fallback cases.
 
diff --git a/src/lib/elementary/efl_ui_text_factory_images.eo b/src/lib/elementary/efl_ui_text_factory_images.eo
index 012c3e1..dbbe2a2 100644
--- a/src/lib/elementary/efl_ui_text_factory_images.eo
+++ b/src/lib/elementary/efl_ui_text_factory_images.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Factory.Images (Efl.Object, Efl.Canvas.Text_Factory)
+class Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Text_Factory
 {
    [[Factory that creates images given key string
 
diff --git a/src/lib/elementary/efl_ui_text_part.eo b/src/lib/elementary/efl_ui_text_part.eo
index a0a4b13..b1bf6d5 100644
--- a/src/lib/elementary/efl_ui_text_part.eo
+++ b/src/lib/elementary/efl_ui_text_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Text_Part (Efl.Ui.Layout_Part_Text)
+class Efl.Ui.Text_Part extends Efl.Ui.Layout_Part_Text
 {
    [[Efl UI Text internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_textpath.eo b/src/lib/elementary/efl_ui_textpath.eo
index bc25a0b..3c9dff4 100644
--- a/src/lib/elementary/efl_ui_textpath.eo
+++ b/src/lib/elementary/efl_ui_textpath.eo
@@ -4,7 +4,7 @@ enum Efl.Ui.Textpath_Direction {
     ccw [[Counter-clockwise]]
 }
 
-class Efl.Ui.Textpath (Efl.Ui.Layout, Efl.Text, Efl.Gfx.Path)
+class Efl.Ui.Textpath extends Efl.Ui.Layout implements Efl.Text, Efl.Gfx.Path
 {
    [[Efl Ui Textpath class]]
    legacy_prefix: elm_textpath;
diff --git a/src/lib/elementary/efl_ui_textpath_legacy.eo b/src/lib/elementary/efl_ui_textpath_legacy.eo
index fd19602..7ac3572 100644
--- a/src/lib/elementary/efl_ui_textpath_legacy.eo
+++ b/src/lib/elementary/efl_ui_textpath_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Textpath_Legacy (Efl.Ui.Textpath, Efl.Ui.Legacy)
+class Efl.Ui.Textpath_Legacy extends Efl.Ui.Textpath implements Efl.Ui.Legacy
 {
    [[Textpath widget]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_textpath_part.eo b/src/lib/elementary/efl_ui_textpath_part.eo
index a603880..8a51a53 100644
--- a/src/lib/elementary/efl_ui_textpath_part.eo
+++ b/src/lib/elementary/efl_ui_textpath_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Textpath_Part (Efl.Ui.Layout_Part_Text)
+class Efl.Ui.Textpath_Part extends Efl.Ui.Layout_Part_Text
 {
    [[Efl UI Textpath internal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_theme.eo b/src/lib/elementary/efl_ui_theme.eo
index 73b158a..8f18db4 100644
--- a/src/lib/elementary/efl_ui_theme.eo
+++ b/src/lib/elementary/efl_ui_theme.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Theme (Efl.Object)
+class Efl.Ui.Theme extends Efl.Object
 {
    [[Efl Ui Theme class]]
    eo_prefix: efl_ui_theme;
diff --git a/src/lib/elementary/efl_ui_timepicker.eo b/src/lib/elementary/efl_ui_timepicker.eo
index dc2682d..d91a761 100644
--- a/src/lib/elementary/efl_ui_timepicker.eo
+++ b/src/lib/elementary/efl_ui_timepicker.eo
@@ -1,8 +1,8 @@
-class Efl.Ui.Timepicker (Efl.Ui.Layout)
+class Efl.Ui.Timepicker extends Efl.Ui.Layout
 {
    [[Timepicker widget
-   
-     This is a widget which allows the user to pick a time using internal spinner. 
+
+     This is a widget which allows the user to pick a time using internal spinner.
      User can use the internal spinner to select hour, minute, AM/PM or user can input
      value using internal entry.
    ]]
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 8659752..a7c8378 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Video (Efl.Ui.Layout, Efl.Player, Efl.Access.Widget.Action)
+class Efl.Ui.Video extends Efl.Ui.Layout implements Efl.Player, Efl.Access.Widget.Action
 {
    [[Efl UI video class]]
    legacy_prefix: elm_video;
diff --git a/src/lib/elementary/efl_ui_video_legacy.eo b/src/lib/elementary/efl_ui_video_legacy.eo
index 9edfc48..4d5efc8 100644
--- a/src/lib/elementary/efl_ui_video_legacy.eo
+++ b/src/lib/elementary/efl_ui_video_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Video_Legacy (Efl.Ui.Video, Efl.Ui.Legacy)
+class Efl.Ui.Video_Legacy extends Efl.Ui.Video implements Efl.Ui.Legacy
 {
    [[Efl UI video class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_widget_part.eo b/src/lib/elementary/efl_ui_widget_part.eo
index ac3a2d9..b984e49 100644
--- a/src/lib/elementary/efl_ui_widget_part.eo
+++ b/src/lib/elementary/efl_ui_widget_part.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Widget_Part (Efl.Object)
+class Efl.Ui.Widget_Part extends Efl.Object
 {
    [[This is the base class for all "Part" handles in Efl.Ui widgets.
 
diff --git a/src/lib/elementary/efl_ui_widget_part_bg.eo b/src/lib/elementary/efl_ui_widget_part_bg.eo
index 8faa63b..59fd301 100644
--- a/src/lib/elementary/efl_ui_widget_part_bg.eo
+++ b/src/lib/elementary/efl_ui_widget_part_bg.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Widget_Part_Bg (Efl.Ui.Widget_Part, Efl.File, Efl.Gfx.Color, Efl.Gfx.Image)
+class Efl.Ui.Widget_Part_Bg extends Efl.Ui.Widget_Part implements Efl.File, Efl.Gfx.Color, Efl.Gfx.Image
 {
    [[Elementary widget internal part background class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_widget_part_shadow.eo b/src/lib/elementary/efl_ui_widget_part_shadow.eo
index 4d611c3..0dc4c7d 100644
--- a/src/lib/elementary/efl_ui_widget_part_shadow.eo
+++ b/src/lib/elementary/efl_ui_widget_part_shadow.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Widget_Part_Shadow (Efl.Ui.Widget_Part, Efl.Gfx.Color,
-                                 Efl.Gfx.Blur, Efl.Gfx.Filter)
+class Efl.Ui.Widget_Part_Shadow extends Efl.Ui.Widget_Part implements Efl.Gfx.Color,
+                                 Efl.Gfx.Blur, Efl.Gfx.Filter
 {
    [[A drop-shadow or glow effect around any widget.
 
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 000b4e9..2dbd882 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -131,7 +131,7 @@ enum Efl.Ui.Win_Move_Resize_Mode
      the window by combining these modes. However only limited combinations
      are allowed.
 
-     Currently, only the following 9 combinations are permitted. 
+     Currently, only the following 9 combinations are permitted.
      More combinations may be added in future:
      1. move,
      2. top,
@@ -154,11 +154,11 @@ enum Efl.Ui.Win_Move_Resize_Mode
    right = (1 << 4)    [[Start resizing window to the right]]
 }
 
-class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Access.Window,
+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)
+                  Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root
 {
    [[Efl UI window class]]
    legacy_prefix: elm_win;
diff --git a/src/lib/elementary/efl_ui_win_inlined.eo b/src/lib/elementary/efl_ui_win_inlined.eo
index 7c4b498..2ef4806 100644
--- a/src/lib/elementary/efl_ui_win_inlined.eo
+++ b/src/lib/elementary/efl_ui_win_inlined.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win_Inlined (Efl.Ui.Win)
+class Efl.Ui.Win_Inlined extends Efl.Ui.Win
 {
    [[An inlined window.
 
diff --git a/src/lib/elementary/efl_ui_win_inlined_legacy.eo b/src/lib/elementary/efl_ui_win_inlined_legacy.eo
index 5c954a2..91ca738 100644
--- a/src/lib/elementary/efl_ui_win_inlined_legacy.eo
+++ b/src/lib/elementary/efl_ui_win_inlined_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win_Inlined_Legacy (Efl.Ui.Win_Inlined, Efl.Ui.Legacy)
+class Efl.Ui.Win_Inlined_Legacy extends Efl.Ui.Win_Inlined implements Efl.Ui.Legacy
 {
    [[Elementary window inlined class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_win_legacy.eo b/src/lib/elementary/efl_ui_win_legacy.eo
index 952464b..7a0e562 100644
--- a/src/lib/elementary/efl_ui_win_legacy.eo
+++ b/src/lib/elementary/efl_ui_win_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win_Legacy (Efl.Ui.Win, Efl.Ui.Legacy)
+class Efl.Ui.Win_Legacy extends Efl.Ui.Win implements Efl.Ui.Legacy
 {
    [[Efl UI window class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_win_part.eo b/src/lib/elementary/efl_ui_win_part.eo
index acb6f43..1b93fc2 100644
--- a/src/lib/elementary/efl_ui_win_part.eo
+++ b/src/lib/elementary/efl_ui_win_part.eo
@@ -1,5 +1,5 @@
-class Efl.Ui.Win_Part (Efl.Ui.Widget_Part, Efl.Content, Efl.Gfx.Entity, Efl.Gfx.Color,
-                       Efl.File)
+class Efl.Ui.Win_Part extends Efl.Ui.Widget_Part implements Efl.Content, Efl.Gfx.Entity, Efl.Gfx.Color,
+                       Efl.File
 {
    [[Efl UI window interal part class]]
    data: null;
diff --git a/src/lib/elementary/efl_ui_win_socket.eo b/src/lib/elementary/efl_ui_win_socket.eo
index 2033bf8..9f2aa02 100644
--- a/src/lib/elementary/efl_ui_win_socket.eo
+++ b/src/lib/elementary/efl_ui_win_socket.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win_Socket (Efl.Ui.Win)
+class Efl.Ui.Win_Socket extends Efl.Ui.Win
 {
    [[An off-screen window to be displayed in a remote process.
 
diff --git a/src/lib/elementary/efl_ui_win_socket_legacy.eo b/src/lib/elementary/efl_ui_win_socket_legacy.eo
index 696032a..0dff710 100644
--- a/src/lib/elementary/efl_ui_win_socket_legacy.eo
+++ b/src/lib/elementary/efl_ui_win_socket_legacy.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Win_Socket_Legacy (Efl.Ui.Win_Socket, Efl.Ui.Legacy)
+class Efl.Ui.Win_Socket_Legacy extends Efl.Ui.Win_Socket implements Efl.Ui.Legacy
 {
    [[Elementary window socket class]]
    data: null;
diff --git a/src/lib/elementary/elm_access.eo b/src/lib/elementary/elm_access.eo
index fae20a6..3f81dcf 100644
--- a/src/lib/elementary/elm_access.eo
+++ b/src/lib/elementary/elm_access.eo
@@ -1,4 +1,4 @@
-class Elm.Access (Efl.Ui.Widget, Efl.Access.Widget.Action)
+class Elm.Access extends Efl.Ui.Widget implements Efl.Access.Widget.Action
 {
    [[Elm abstract accessibility class]]
    legacy_prefix: elm_access;
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index 8a9f4d3..260e699 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
    all = (1 << 3) - 1 [[All positions for left/center/right.]]
 }
 
-class Elm.Actionslider (Efl.Ui.Layout, Efl.Ui.Selectable, Efl.Ui.Legacy)
+class Elm.Actionslider extends Efl.Ui.Layout implements Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[An actionslider is a switcher for 2 or 3 labels
 
diff --git a/src/lib/elementary/elm_actionslider_part.eo b/src/lib/elementary/elm_actionslider_part.eo
index dee607a..5b93976 100644
--- a/src/lib/elementary/elm_actionslider_part.eo
+++ b/src/lib/elementary/elm_actionslider_part.eo
@@ -1,4 +1,4 @@
-class Elm_Actionslider.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm_Actionslider.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary Actionslider internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo
index 1e79fcd..e386f39 100644
--- a/src/lib/elementary/elm_atspi_app_object.eo
+++ b/src/lib/elementary/elm_atspi_app_object.eo
@@ -1,4 +1,4 @@
-class Elm.Atspi.App.Object (Efl.Object, Efl.Access.Object)
+class Elm.Atspi.App.Object extends Efl.Object implements Efl.Access.Object
 {
    [[AT-SPI application object class]]
    legacy_prefix: elm_atspi_app_object;
diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo
index 9db28c2..4034ef6 100644
--- a/src/lib/elementary/elm_atspi_bridge.eo
+++ b/src/lib/elementary/elm_atspi_bridge.eo
@@ -1,4 +1,4 @@
-class Elm.Atspi.Bridge (Efl.Object)
+class Elm.Atspi.Bridge extends Efl.Object
 {
    [[AT-SPI bridge class]]
    legacy_prefix: elm_atspi_bridge;
diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo
index 36bdd9d..5bda1dc 100644
--- a/src/lib/elementary/elm_box.eo
+++ b/src/lib/elementary/elm_box.eo
@@ -1,4 +1,4 @@
-class Elm.Box (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Box extends Efl.Ui.Widget implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Elementary box class]]
    legacy_prefix: elm_box;
diff --git a/src/lib/elementary/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo
index 79e8baa..4d249d2 100644
--- a/src/lib/elementary/elm_bubble.eo
+++ b/src/lib/elementary/elm_bubble.eo
@@ -12,7 +12,7 @@ enum Elm.Bubble.Pos
   bottom_right [[The arrow of the bubble points to the bottom right corner.]]
 }
 
-class Elm.Bubble (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Bubble extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Speech bubble widget used in messaging applications]]
 
diff --git a/src/lib/elementary/elm_bubble_part.eo b/src/lib/elementary/elm_bubble_part.eo
index 8af7ff2..701892e 100644
--- a/src/lib/elementary/elm_bubble_part.eo
+++ b/src/lib/elementary/elm_bubble_part.eo
@@ -1,4 +1,4 @@
-class Elm_Bubble.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm_Bubble.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary Bubble internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo
index 73d67b0..4eb1d3f 100644
--- a/src/lib/elementary/elm_calendar.eo
+++ b/src/lib/elementary/elm_calendar.eo
@@ -72,8 +72,8 @@ struct Elm.Calendar.Mark; [[Item handle for a calendar mark.
                             with @Elm.Calendar.mark_del.
                           ]]
 
-class Elm.Calendar (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
-                    Efl.Ui.Legacy)
+class Elm.Calendar extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Access.Widget.Action,
+                    Efl.Ui.Legacy
 {
    [[Calendar widget
 
diff --git a/src/lib/elementary/elm_calendar_item.eo b/src/lib/elementary/elm_calendar_item.eo
index 3ae581d..3bb6f4d 100644
--- a/src/lib/elementary/elm_calendar_item.eo
+++ b/src/lib/elementary/elm_calendar_item.eo
@@ -1,4 +1,4 @@
-class Elm.Calendar.Item (Efl.Object, Efl.Ui.Focus.Object)
+class Elm.Calendar.Item extends Efl.Object implements Efl.Ui.Focus.Object
 {
     [[Elm Calendar Item class]]
     methods {
diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo
index b292fa5..65813b7 100644
--- a/src/lib/elementary/elm_clock.eo
+++ b/src/lib/elementary/elm_clock.eo
@@ -18,7 +18,7 @@ enum Elm.Clock.Edit_Mode
    all = (1 << 6) - 1 [[All digits should be editable.]]
 }
 
-class Elm.Clock (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Clock extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Digital clock widget
 
diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo
index 8f9ff0d..d464a5b 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -4,7 +4,7 @@ import elm_interface_scrollable;
 struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */
 struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */
 
-class Elm.Code_Widget (Efl.Ui.Layout, Efl.Access.Text)
+class Elm.Code_Widget extends Efl.Ui.Layout implements Efl.Access.Text
 {
    [[Elementary code widget]]
    eo_prefix: elm_obj_code_widget;
diff --git a/src/lib/elementary/elm_code_widget_legacy.eo b/src/lib/elementary/elm_code_widget_legacy.eo
index 1c228b3..6de8928 100644
--- a/src/lib/elementary/elm_code_widget_legacy.eo
+++ b/src/lib/elementary/elm_code_widget_legacy.eo
@@ -1,4 +1,4 @@
-class Elm.Code_Widget_Legacy (Elm.Code_Widget, Efl.Ui.Legacy)
+class Elm.Code_Widget_Legacy extends Elm.Code_Widget implements Efl.Ui.Legacy
 {
    [[Elementary code widget]]
    data: null;
diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo
index c784d1f..a801d8c 100644
--- a/src/lib/elementary/elm_color_item.eo
+++ b/src/lib/elementary/elm_color_item.eo
@@ -1,4 +1,4 @@
-class Elm.Color.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Access.Widget.Action)
+class Elm.Color.Item extends Elm.Widget.Item implements Efl.Ui.Focus.Object, Efl.Access.Widget.Action
 {
    [[Elementary color item class]]
    legacy_prefix: elm_color_item;
diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo
index e8d719f..0d57a6f 100644
--- a/src/lib/elementary/elm_colorselector.eo
+++ b/src/lib/elementary/elm_colorselector.eo
@@ -12,8 +12,8 @@ enum Elm.Colorselector.Mode
    all [[All possible color selector is displayed.]]
 }
 
-class Elm.Colorselector (Efl.Ui.Layout, Efl.Ui.Focus.Composition,
-                         Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Colorselector extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition,
+                         Efl.Access.Widget.Action, Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Elementary colorselector class]]
    legacy_prefix: elm_colorselector;
diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo
index 37cba06..1baafd3 100644
--- a/src/lib/elementary/elm_conformant.eo
+++ b/src/lib/elementary/elm_conformant.eo
@@ -1,4 +1,4 @@
-class Elm.Conformant (Efl.Ui.Layout, Efl.Ui.Legacy)
+class Elm.Conformant extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
    [[Elementary conformant class]]
    legacy_prefix: elm_conformant;
diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo
index 35956c6..7d94b87 100644
--- a/src/lib/elementary/elm_ctxpopup.eo
+++ b/src/lib/elementary/elm_ctxpopup.eo
@@ -8,7 +8,7 @@ enum Elm.Ctxpopup.Direction
    unknown [[Ctxpopup does not determine it's direction yet.]]
 }
 
-class Elm.Ctxpopup (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Ctxpopup extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary context popup class]]
    legacy_prefix: elm_ctxpopup;
diff --git a/src/lib/elementary/elm_ctxpopup_item.eo b/src/lib/elementary/elm_ctxpopup_item.eo
index 2abdbfc..c0be337 100644
--- a/src/lib/elementary/elm_ctxpopup_item.eo
+++ b/src/lib/elementary/elm_ctxpopup_item.eo
@@ -1,5 +1,5 @@
-class Elm.Ctxpopup.Item(Elm.Widget.Item, Efl.Access.Widget.Action,
-                        Efl.Ui.Legacy)
+class Elm.Ctxpopup.Item extends Elm.Widget.Item implements Efl.Access.Widget.Action,
+                        Efl.Ui.Legacy
 {
    [[Elementary context popup item class]]
    legacy_prefix: elm_ctxpopup_item;
diff --git a/src/lib/elementary/elm_ctxpopup_part.eo b/src/lib/elementary/elm_ctxpopup_part.eo
index 301cee9..35c39a4 100644
--- a/src/lib/elementary/elm_ctxpopup_part.eo
+++ b/src/lib/elementary/elm_ctxpopup_part.eo
@@ -1,4 +1,4 @@
-class Elm.Ctxpopup.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Ctxpopup.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary contex popup internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo
index f21d746..183e582 100644
--- a/src/lib/elementary/elm_dayselector.eo
+++ b/src/lib/elementary/elm_dayselector.eo
@@ -17,7 +17,7 @@ enum Elm.Dayselector.Day
    max     [[Sentinel value to indicate last enum field during iteration]]
 }
 
-class Elm.Dayselector (Efl.Ui.Layout, Efl.Ui.Legacy)
+class Elm.Dayselector extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
    [[Elementary dayselector class]]
    legacy_prefix: elm_dayselector;
diff --git a/src/lib/elementary/elm_dayselector_item.eo b/src/lib/elementary/elm_dayselector_item.eo
index 8e68c6d..a39a48d 100644
--- a/src/lib/elementary/elm_dayselector_item.eo
+++ b/src/lib/elementary/elm_dayselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Dayselector.Item(Elm.Widget.Item)
+class Elm.Dayselector.Item extends Elm.Widget.Item
 {
    [[Elementary dayselector item class]]
    eo_prefix: elm_dayselector_item;
diff --git a/src/lib/elementary/elm_dayselector_part.eo b/src/lib/elementary/elm_dayselector_part.eo
index f48c5c7..0a13d33 100644
--- a/src/lib/elementary/elm_dayselector_part.eo
+++ b/src/lib/elementary/elm_dayselector_part.eo
@@ -1,4 +1,4 @@
-class Elm.Dayselector.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Dayselector.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary dayselector internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index d69ef77..8719c5e 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -1,7 +1,7 @@
-class Elm.Diskselector (Efl.Ui.Widget, Elm.Interface_Scrollable,
+class Elm.Diskselector extends Efl.Ui.Widget implements Elm.Interface_Scrollable,