diff --git a/src/examples/efl_mono/example_numberwrapper.eo b/src/examples/efl_mono/example_numberwrapper.eo
index 4e0279e867..43de18d9c8 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 bfb08b29e7..8fce408cf6 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 66fe8ae5cd..733701f705 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 aae68c16e0..80ec98587b 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 f6f9c07846..c2bc6b909f 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 5d9084ff7d..899d8a0443 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 3c94735427..793f8b6212 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 860de3abc6..30f0e987d3 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 436846e0e9..964d128937 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 eaa55128aa..85dc219ec2 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 9d910f4960..a4dd964bb6 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 1662cffb72..3e376f8976 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 487f8f2d36..f9baae503c 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 c58451c3a5..54249dae32 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 2104b3f278..8e22b828af 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 423233ad2c..2565fba66f 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 b586a88ca2..c0b48c381d 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 8b92505596..c8ecff3dd4 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 8389ed2954..1d4b914e60 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 d98528179a..1bc7099397 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 8872616100..748a3be384 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 3a40861e6f..5ced4e709f 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 0058ceb8a3..aab8443132 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 2aec142abc..ef5ec0ce2a 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 5a86333f29..047c1c4b6a 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 0b30847c3a..a676555aca 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 bf77810713..291b0bc6af 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 2b5ce084f6..44841d8068 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 be05c987c2..d353a2e9f4 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 21bf540621..47c7e3cfb6 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 45bb2f65a8..d06a9cc424 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 fca9b9c2ba..35ecc270af 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 ef2af4d465..ce59ea2b16 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 04b1d5a458..04fbdf8ae3 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 f20ae03694..f085043d12 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 1276be67a8..8543eec758 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 be4fe6a452..f0b34ab078 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 244d8f4a75..ccfa354346 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 d602b96d40..2f644ff354 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 21698161dd..14593425a4 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 565bca43c7..aedc0c2dec 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 43f0d7b0e4..9b79e62ddd 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 533e4b2326..76aeb42f51 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 8cdd935753..8e6e3d48e6 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 a89e15c25c..72d65d142c 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 2e97f4ea08..6d28e7edbf 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 1045fd46a4..e5358d543b 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 14c912753b..00c503dd7c 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 76bdb3aeca..26717efa04 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 a9eb6bb101..8b5955a49a 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 d561833ddf..11c97d4889 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 5aaf13bc1e..53903032f9 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 cfe9145ac4..5afdeb465c 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 04e0a4c783..ccc2cf6e8f 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 95a10434bf..18c0c35e0b 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 38ec878808..0a5aa941b2 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 c732e1c621..832361bbea 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 757e926ab5..75c7deeefc 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 4e5a407015..af7aeec1bd 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 9686cc2580..f2454e5db2 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 6c8f0f164c..f7a18122c0 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 c15d5f88a1..202b636183 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 eebbb0ac5b..3d1263134f 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 2c0a6bcbd3..cb46921e9c 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 6e3e5760c9..3934828ffb 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 50ec24d80c..52b0bcc595 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 b7c63a35aa..de6631a32b 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 afc5949c4e..3e4138eed4 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 6eeeedef31..205ca8ba9f 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 9e82ea6e7f..9e05dd6848 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 955d972430..5bd087a534 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 68965ffe9f..84db3f8ab7 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 951fe7f8cc..c5b468b759 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 b20425945d..07b7c3e8da 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 c8e306630f..dc607636dc 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 de40b1da45..d3f0d5b3e7 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 97caebc282..7e2b53307c 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 9befbeaf0e..854130e512 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 95cdea693c..f1e1625aa1 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 bf694678b4..c19fe198b8 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 f389a23bb4..03d7e49988 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 76f2c82e62..f267a23609 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 948792a9c0..28f267f164 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 afcd44182c..144019d51b 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 7c958441ee..336d4697f7 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 034a27a635..37dc43f2ea 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 0623a8ebb9..5971664844 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 954ecbc079..3f4154f819 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 6323ef6f1f..608581b993 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 5cc4bdf7f2..f2705dd2a1 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 f05ea41a67..03bde1ead5 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 04f19ba7e3..b4889b352f 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 7d7eb8247e..76c3987343 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 2d0333965a..65d807aec0 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 1f225ae3de..a7bb40a550 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 f5001f2e73..bff48e2ca1 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 5feac56d84..f607e81408 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 c96e9a7788..927e70ac9a 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 02be0707c8..0173bab7db 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 4a80b1cfe9..25e694c589 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 e4b10b93d9..ceb3177031 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 32634e8137..6b1c4723ed 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 877438527e..e0184381c4 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 389c6bcc9f..0546118c73 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 e6c989871d..91a0760bb5 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 b7d90d6418..230c2aa061 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 ae298273bd..c8c6f1e46c 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 f39d3dc8bb..4055217c51 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 eb64791b67..845694d489 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 5c8bffb9a6..9ac9e637c9 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 8ba45ee8b9..c8776ff7f2 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 7dbebbc76b..bd0d19a82a 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 546e478812..743808b572 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 262d782eee..2eb37d06ad 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 d064027f17..499dfa430d 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 ae74f80295..66ef3e6cf4 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 2931621d62..d5827c5a24 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 0bb8b3ee1c..3c8fe5bb5d 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 4aa547cb21..6ea877aeb4 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 a189b9323c..aba9adedb4 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 0728dc7312..194c6bd546 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 110c4be072..a3602438cb 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 6a46d8071c..c56ae14f01 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 77e359ce04..bf67b7ea7b 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 6c720c5567..2575a507fe 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 d54e289bbe..fdcb6eb86f 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 da17167f48..41e00d05c7 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 3238a703a3..1f8ab61651 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 71b8a7bdb0..26b16437ab 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 7460aaa039..7ab9aab3b4 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 90e31ef8d5..76a546b5eb 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 f4543d7f6b..82e5bdbdfe 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 e4bbd5e712..7d2ebfbbee 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 f8cff542b2..adb22ba3dc 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 bf01ef88ce..acb2c8d7ac 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 ba66edfb5d..baa055146e 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 c894e2cf22..c7e2f2b743 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 649b6536c4..78bc2b4a38 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 cccc17c59a..ad235e0332 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 ef0f76de79..b6ea04f879 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 5d311a5e79..9486bf608f 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 7907db9346..b856f08f12 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 69e5f61a16..678b210af2 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 b15225742c..463af9676e 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 74a0876344..81d9b1634e 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 cf98ea6b7f..f35701f11b 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 697c2d1399..c19762fe56 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 0d3d72196b..84c3b0f1fb 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 b9d26fdfe8..bb4e81c222 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 8bf30964a2..19212c7c87 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 3f89751623..14f0f3a43a 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 4959face9b..3bb66972d2 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 beaec44e7a..d9d38b5301 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 fdf270874d..4724dccc47 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 62dbf6de25..af6b59278a 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 02393c5fc8..fb21570094 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 7f92c0dc9f..3c846cce57 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 729234e2cd..c0f5862484 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 486ccbd98f..66ebd2a1a7 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 75436f6f7c..4dede025b6 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 94ed732b88..d512ad881f 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 66abdf4d23..2b5c97e4b4 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 0ee7309adf..15a3005746 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 1baeff1755..8aa795685e 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 3816422bc9..233d9ad95e 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 0f487138ea..4cb307e04e 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 d3036196e2..f3505140ae 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 47624e44b3..bc9b33e86e 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 e404af7813..4bae6917e0 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 8b9c06bd87..ea71e89a32 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 e444e4deba..ca16e604c8 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 0a3f84b894..9dad61e75f 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 372099e1cd..dff060f9bd 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 575749ab78..59ecc649ea 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 20284f2d1c..c09d075d40 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 1ebd8ae3be..af6279eea2 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 660afa4f2a..db6ce0836d 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 166df84676..0a092a251f 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 00e60d6f69..5ccb5bda4e 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 8e5948ad80..d4aca6941e 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 d149213089..c7b51fbf01 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 319be19fe3..ff0ec0e432 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 ad91107cbb..9b3456dee5 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 971a0187c8..83e403f198 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 1253a88aca..e05cd09b96 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 9100f6967b..52f4964c6c 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 197828e005..228b417347 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 3192df1b61..eb49aba370 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 1a40249e18..15f4d922a8 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 30f677f53d..c94b5a5f02 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 21ebddb3e4..43e3dd1613 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 846fbf68af..51fe71f8ae 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 8c3f1de642..31b29acd56 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 2f67cc7423..4962f782d6 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 b27b8ca77d..bd47b60e2e 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 da285179b0..6d0bc5ccb5 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 62594f3b22..eb4d0c3669 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 704f70952c..28f9ca5af9 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 f7b800121f..4a96713c83 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 16d8105190..26d85973c5 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 fc88747c09..124d27c909 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 80e7caf33c..2222763c1e 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 b091225cb1..a8361cf09d 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 faffc0582c..fd989e518d 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 1b687014bb..13924fccd5 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 44d3df9276..c85d163be1 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 cee114a2b8..8089c48763 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 ceca6466e3..e7edcdeb2e 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 5170627b81..fe4cf365d5 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 06730a3f0d..f100d02286 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 90cab824fe..c390e166ff 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 c037fe787e..d7ad5d1a36 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 893630aa3a..50b5d5b22c 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 0fa7ad5f85..43bb166f62 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 15172dc52a..0a833893a5 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 7bb4fa5728..8ec81df6f8 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 116fdd39e0..cd55741ec8 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 86f4b8409f..57c8d70424 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 95c42c4c3a..2fbdd4dcd4 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 f321d47e3a..e5468dd027 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 74d3449e90..03626fcb04 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 ca469342d3..fa79b58975 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 03d1f98234..35774f30b5 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 966a5dd196..12d39f32d2 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 256271a455..05a9e120ec 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 70bb87861b..4441f56f07 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 32f66a86f3..fc52f8cf05 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 cf3f20f851..c572dad4e9 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 52061e5380..9afc2acf4a 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 b0535b1e5d..d025f017f0 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 6cfcdbe23c..05d4618c68 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 03b339dce7..8158c5001a 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 012c3e1fad..dbbe2a2bb7 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 a0a4b13463..b1bf6d5bcc 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 bc25a0bb4d..3c9dff4ab7 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 fd19602b1f..7ac3572ea2 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 a60388000d..8a51a53ffe 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 73b158af52..8f18db4021 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 dc2682d5fe..d91a76137f 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 8659752570..a7c8378933 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 9edfc48867..4d5efc8def 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 ac3a2d9626..b984e499ff 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 8faa63b315..59fd3014ef 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 4d611c3a04..0dc4c7d127 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 000b4e9ebc..2dbd882fab 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 7c4b498685..2ef4806cc3 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 5c954a22e3..91ca73878f 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 952464ba71..7a0e562f97 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 acb6f4349e..1b93fc2905 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 2033bf8cd8..9f2aa02cb9 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 696032a797..0dff710193 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 fae20a694d..3f81dcffd4 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 8a9f4d3493..260e699420 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 dee607a949..5b93976cd1 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 1e79fcd493..e386f390e0 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 9db28c26de..4034ef65d1 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 36bdd9d7bc..5bda1dc249 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 79e8baac8c..4d249d210e 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 8af7ff2c50..701892e3f4 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 73d67b04ae..4eb1d3fdb5 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 3ae581d435..3bb6f4dc46 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 b292fa58d2..65813b717b 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 8f9ff0dc0f..d464a5b178 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 1c228b3e76..6de8928a25 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 c784d1f9db..a801d8c715 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 e8d719f819..0d57a6f9f0 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 37cba0691b..1baafd3c7f 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 35956c68f2..7d94b87fe4 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 2abdbfc9ad..c0be337d23 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 301cee9870..35c39a4c92 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 f21d746087..183e582447 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 8e68c6dca0..a39a48d701 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 f48c5c7bd9..0a13d331ba 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 d69ef7733f..8719c5e4db 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,
                         Efl.Access.Widget.Action,
                         Efl.Ui.Clickable, Efl.Ui.Scrollable,
-                        Efl.Ui.Selectable, Efl.Ui.Legacy)
+                        Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary diskselector class]]
    legacy_prefix: elm_diskselector;
diff --git a/src/lib/elementary/elm_diskselector_item.eo b/src/lib/elementary/elm_diskselector_item.eo
index 740364faa7..7653061255 100644
--- a/src/lib/elementary/elm_diskselector_item.eo
+++ b/src/lib/elementary/elm_diskselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Diskselector.Item(Elm.Widget.Item, Efl.Ui.Legacy)
+class Elm.Diskselector.Item extends Elm.Widget.Item implements Efl.Ui.Legacy
 {
       [[Elementary diskselector item class]]
       legacy_prefix: elm_diskselector_item;
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index 3275b0f1b4..f2e5e3b59a 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -3,10 +3,10 @@ import elm_general;
 type Elm_Entry_Item_Provider_Cb: __undefined_type; [[Elementary entry item provider callback type]]
 type Elm_Entry_Filter_Cb: __undefined_type; [[Elementary entry filter callback type]]
 
-class Elm.Entry (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
+class Elm.Entry extends Efl.Ui.Layout implements Elm.Interface_Scrollable, Efl.Ui.Clickable,
                  Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
                  Efl.Ui.Selectable, Efl.Ui.Scrollable, Efl.Access.Widget.Action,
-                 Efl.Ui.Legacy)
+                 Efl.Ui.Legacy
 {
    [[Elementary entry class]]
    legacy_prefix: elm_entry;
diff --git a/src/lib/elementary/elm_entry_part.eo b/src/lib/elementary/elm_entry_part.eo
index 8b33908264..ebeeb88270 100644
--- a/src/lib/elementary/elm_entry_part.eo
+++ b/src/lib/elementary/elm_entry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Entry.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Entry.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary entry internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index ffadc12390..eac99d9065 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,6 +1,6 @@
-class Elm.Fileselector (Efl.Ui.Layout, Elm.Interface.Fileselector,
+class Elm.Fileselector extends Efl.Ui.Layout implements Elm.Interface.Fileselector,
                         Efl.Access.Widget.Action, Efl.Ui.Focus.Composition,
-                        Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
+                        Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary fileselector class]]
    legacy_prefix: elm_fileselector;
diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo
index 579ed656b5..545409f229 100644
--- a/src/lib/elementary/elm_fileselector_button.eo
+++ b/src/lib/elementary/elm_fileselector_button.eo
@@ -1,5 +1,5 @@
-class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector,
-                               Efl.Ui.Legacy)
+class Elm.Fileselector_Button extends Efl.Ui.Button implements Elm.Interface.Fileselector,
+                               Efl.Ui.Legacy
 {
    [[Elementary fileselector button class]]
    event_prefix: elm_fileselector_button;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 29609f371c..3a91c6ec2f 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,5 +1,5 @@
-class Elm.Fileselector_Entry (Efl.Ui.Layout, Elm.Interface.Fileselector,
-                              Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
+class Elm.Fileselector_Entry extends Efl.Ui.Layout implements Elm.Interface.Fileselector,
+                              Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary fileselector entry class]]
    event_prefix: elm_fileselector_entry;
diff --git a/src/lib/elementary/elm_fileselector_entry_part.eo b/src/lib/elementary/elm_fileselector_entry_part.eo
index 3011f215ef..691edaa191 100644
--- a/src/lib/elementary/elm_fileselector_entry_part.eo
+++ b/src/lib/elementary/elm_fileselector_entry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector.Entry.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Fileselector.Entry.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary fileselector entry internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_fileselector_part.eo b/src/lib/elementary/elm_fileselector_part.eo
index e32512b384..8e504f443f 100644
--- a/src/lib/elementary/elm_fileselector_part.eo
+++ b/src/lib/elementary/elm_fileselector_part.eo
@@ -1,4 +1,4 @@
-class Elm.Fileselector.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Fileselector.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary fileselector entry internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_flip_part.eo b/src/lib/elementary/elm_flip_part.eo
index 506f28e499..df5a1177f9 100644
--- a/src/lib/elementary/elm_flip_part.eo
+++ b/src/lib/elementary/elm_flip_part.eo
@@ -1,4 +1,4 @@
-class Elm.Flip.Part (Efl.Object, Efl.Content)
+class Elm.Flip.Part extends Efl.Object implements Efl.Content
 {
    [[Elementary flip internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index e1533b0d07..a0dc8a2401 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,6 +1,6 @@
-class Elm.Flipselector (Efl.Ui.Layout, Efl.Ui.Range,
+class Elm.Flipselector extends Efl.Ui.Layout implements Efl.Ui.Range,
                         Efl.Access.Widget.Action,
-                        Efl.Ui.Selectable, Efl.Ui.Legacy)
+                        Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary flipselector class]]
    legacy_prefix: elm_flipselector;
diff --git a/src/lib/elementary/elm_flipselector_item.eo b/src/lib/elementary/elm_flipselector_item.eo
index 9ff61ca844..9710ebe354 100644
--- a/src/lib/elementary/elm_flipselector_item.eo
+++ b/src/lib/elementary/elm_flipselector_item.eo
@@ -1,4 +1,4 @@
-class Elm.Flipselector.Item(Elm.Widget.Item)
+class Elm.Flipselector.Item extends Elm.Widget.Item
 {
    [[Elementary flipselector item class]]
    legacy_prefix: elm_flipselector_item;
diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo
index 55ded4174d..9907ba2d2d 100644
--- a/src/lib/elementary/elm_gengrid.eo
+++ b/src/lib/elementary/elm_gengrid.eo
@@ -9,9 +9,9 @@ enum Elm.Gengrid.Reorder_Type
    swap    [[Swap reorder type]]
 }
 
-class Elm.Gengrid (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
+class Elm.Gengrid extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Elm.Interface_Scrollable,
                    Efl.Ui.Clickable, Efl.Access.Widget.Action,
-                   Efl.Access.Selection, Efl.Ui.Legacy)
+                   Efl.Access.Selection, Efl.Ui.Legacy
 {
    [[Elementary gengrid class]]
    legacy_prefix: elm_gengrid;
diff --git a/src/lib/elementary/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo
index 2086d26231..e4f01c1952 100644
--- a/src/lib/elementary/elm_gengrid_item.eo
+++ b/src/lib/elementary/elm_gengrid_item.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Gengrid.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
+class Elm.Gengrid.Item extends Elm.Widget.Item.Static_Focus implements Efl.Ui.Focus.Object, Efl.Ui.Legacy
 {
       [[Elementary gengrid item class]]
       legacy_prefix: elm_gengrid_item;
diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo
index cce3583ae7..a6ceeed60d 100644
--- a/src/lib/elementary/elm_gengrid_pan.eo
+++ b/src/lib/elementary/elm_gengrid_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Gengrid.Pan (Elm.Pan)
+class Elm.Gengrid.Pan extends Elm.Pan
 {
    [[Elementary gengrid pan class]]
    legacy_prefix: elm_gengrid_pan;
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index 9747b4765f..aeb9e6b596 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -1,8 +1,8 @@
 import elm_general;
 
-class Elm.Genlist (Efl.Ui.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
+class Elm.Genlist extends Efl.Ui.Layout implements Elm.Interface_Scrollable, Efl.Ui.Clickable,
                    Efl.Access.Widget.Action, Efl.Access.Selection,
-                   Efl.Ui.Selectable, Efl.Ui.Legacy)
+                   Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary genlist class]]
    legacy_prefix: elm_genlist;
diff --git a/src/lib/elementary/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo
index e78c83d0d2..b9fa121452 100644
--- a/src/lib/elementary/elm_genlist_item.eo
+++ b/src/lib/elementary/elm_genlist_item.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Genlist.Item(Elm.Widget.Item.Static_Focus, Efl.Ui.Legacy)
+class Elm.Genlist.Item extends Elm.Widget.Item.Static_Focus implements Efl.Ui.Legacy
 {
    [[Elementary genlist item class]]
    legacy_prefix: elm_genlist_item;
diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo
index 9f1966cb31..3c92efe1d0 100644
--- a/src/lib/elementary/elm_genlist_pan.eo
+++ b/src/lib/elementary/elm_genlist_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Genlist.Pan (Elm.Pan)
+class Elm.Genlist.Pan extends Elm.Pan
 {
    [[Elementary genlist pan class]]
    legacy_prefix: elm_genlist_pan;
diff --git a/src/lib/elementary/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo
index 6f384ed8d9..46a3479564 100644
--- a/src/lib/elementary/elm_gesture_layer.eo
+++ b/src/lib/elementary/elm_gesture_layer.eo
@@ -31,7 +31,7 @@ enum Elm.Gesture.State
    abort [[Ongoing gesture was aborted]]
 }
 
-class Elm.Gesture_Layer (Efl.Ui.Widget, Efl.Ui.Legacy)
+class Elm.Gesture_Layer extends Efl.Ui.Widget implements Efl.Ui.Legacy
 {
    [[Elementary gesture layer class]]
    legacy_prefix: elm_gesture_layer;
diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo
index 05c5498b53..faa03f2691 100644
--- a/src/lib/elementary/elm_glview.eo
+++ b/src/lib/elementary/elm_glview.eo
@@ -80,7 +80,7 @@ enum Elm.GLView.Render.Policy
    always    = 2  [[Render always even when it is not visible]]
 }
 
-class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View, Efl.Ui.Legacy)
+class Elm.Glview extends Efl.Ui.Widget implements Efl.Gfx.View, Efl.Ui.Legacy
 {
    [[Elementary GL view class]]
    legacy_prefix: elm_glview;
@@ -195,7 +195,7 @@ class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View, Efl.Ui.Legacy)
       Efl.Gfx.View.view_size { get; set; }
    }
    events {
-      created: void; 
+      created: void;
             [[Event dispatched when first render happens.
 
               The callback function gets called once during the
diff --git a/src/lib/elementary/elm_grid.eo b/src/lib/elementary/elm_grid.eo
index ebf5bb2929..157d87544f 100644
--- a/src/lib/elementary/elm_grid.eo
+++ b/src/lib/elementary/elm_grid.eo
@@ -1,4 +1,4 @@
-class Elm.Grid (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Grid extends Efl.Ui.Widget implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Elementary grid class]]
    legacy_prefix: elm_grid;
diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo
index 5f6f633c77..69acfb9b3f 100644
--- a/src/lib/elementary/elm_hover.eo
+++ b/src/lib/elementary/elm_hover.eo
@@ -7,8 +7,8 @@ enum Elm.Hover.Axis
    both [[ELM_HOVER_AXIS_BOTH -- both.]]
 }
 
-class Elm.Hover (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
-                 Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Hover extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Ui.Clickable,
+                 Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary hover class]]
    legacy_prefix: elm_hover;
diff --git a/src/lib/elementary/elm_hover_part.eo b/src/lib/elementary/elm_hover_part.eo
index 7059f735af..2473dc5e89 100644
--- a/src/lib/elementary/elm_hover_part.eo
+++ b/src/lib/elementary/elm_hover_part.eo
@@ -1,4 +1,4 @@
-class Elm.Hover.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Hover.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[elementary hover internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index 807b2a3810..0290850dbc 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,9 +1,9 @@
 import elm_general;
 
-class Elm.Hoversel (Efl.Ui.Button_Legacy, Efl.Ui.Selectable,
+class Elm.Hoversel extends Efl.Ui.Button_Legacy implements Efl.Ui.Selectable,
                     Efl.Ui.Clickable,
                     Efl.Access.Widget.Action,
-                    Efl.Ui.Legacy)
+                    Efl.Ui.Legacy
 {
    [[Elementary hoversel class]]
    legacy_prefix: elm_hoversel;
diff --git a/src/lib/elementary/elm_hoversel_item.eo b/src/lib/elementary/elm_hoversel_item.eo
index 4497a14e2c..dcbfbc03fa 100644
--- a/src/lib/elementary/elm_hoversel_item.eo
+++ b/src/lib/elementary/elm_hoversel_item.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.Hoversel.Item(Elm.Widget.Item, Efl.Ui.Legacy)
+class Elm.Hoversel.Item extends Elm.Widget.Item implements Efl.Ui.Legacy
 {
    [[Elementary hoversel item class]]
    legacy_prefix: elm_hoversel_item;
diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo
index 8fd9d2eef5..35ce8a9e59 100644
--- a/src/lib/elementary/elm_icon.eo
+++ b/src/lib/elementary/elm_icon.eo
@@ -1,4 +1,4 @@
-class Elm.Icon (Efl.Ui.Image, Efl.Ui.Legacy)
+class Elm.Icon extends Efl.Ui.Image implements Efl.Ui.Legacy
 {
    [[Elementary Icon Class]]
    legacy_prefix: elm_icon;
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 3b6bd229a9..adc7b6e6a6 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,5 +1,5 @@
-class Elm.Index (Efl.Ui.Layout, Efl.Ui.Direction,
-                 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
+class Elm.Index extends Efl.Ui.Layout implements Efl.Ui.Direction,
+                 Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[elementary index class]]
    legacy_prefix: elm_index;
diff --git a/src/lib/elementary/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo
index 304f246cb5..5e4491cec9 100644
--- a/src/lib/elementary/elm_index_item.eo
+++ b/src/lib/elementary/elm_index_item.eo
@@ -1,4 +1,4 @@
-class Elm.Index.Item(Elm.Widget.Item, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Index.Item extends Elm.Widget.Item implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary index item class]]
    legacy_prefix: elm_index_item;
diff --git a/src/lib/elementary/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo
index 0b6acf9bc1..594d1e5e7f 100644
--- a/src/lib/elementary/elm_inwin.eo
+++ b/src/lib/elementary/elm_inwin.eo
@@ -1,4 +1,4 @@
-class Elm.Inwin (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
+class Elm.Inwin extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
 {
    [[Elementary inwin class]]
    legacy_prefix: elm_inwin;
diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo
index 6afa5ac497..f9e147db76 100644
--- a/src/lib/elementary/elm_label.eo
+++ b/src/lib/elementary/elm_label.eo
@@ -8,7 +8,7 @@ enum Elm.Label.Slide_Mode
    always [[Slide always.]]
 }
 
-class Elm.Label (Efl.Ui.Layout, Efl.Ui.Legacy)
+class Elm.Label extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
    [[Elementary label class]]
    legacy_prefix: elm_label;
diff --git a/src/lib/elementary/elm_label_part.eo b/src/lib/elementary/elm_label_part.eo
index 9b866bca19..cbbbeaaac4 100644
--- a/src/lib/elementary/elm_label_part.eo
+++ b/src/lib/elementary/elm_label_part.eo
@@ -1,4 +1,4 @@
-class Elm_Label.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm_Label.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary button internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 373a3b7954..d180a766fd 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -1,8 +1,8 @@
 import elm_general;
 
-class Elm.List (Efl.Ui.Layout, Elm.Interface_Scrollable,
+class Elm.List extends Efl.Ui.Layout implements Elm.Interface_Scrollable,
                 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
-                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
+                Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary list class]]
    legacy_prefix: elm_list;
diff --git a/src/lib/elementary/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo
index bef3d8b963..c3d18ba99f 100644
--- a/src/lib/elementary/elm_list_item.eo
+++ b/src/lib/elementary/elm_list_item.eo
@@ -1,4 +1,4 @@
-class Elm.List.Item(Elm.Widget.Item, Efl.Ui.Legacy)
+class Elm.List.Item extends Elm.Widget.Item implements Efl.Ui.Legacy
 {
    [[Elementary list item class]]
    legacy_prefix: elm_list_item;
diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo
index 1075541e64..33ac6a701d 100644
--- a/src/lib/elementary/elm_map.eo
+++ b/src/lib/elementary/elm_map.eo
@@ -49,9 +49,9 @@ enum Elm.Map.Route_Method
 }
 
 
-class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
+class Elm.Map extends Efl.Ui.Widget implements Elm.Interface_Scrollable,
                Efl.Access.Widget.Action,
-               Efl.Ui.Clickable, Efl.Ui.Legacy, Efl.Ui.Zoom)
+               Efl.Ui.Clickable, Efl.Ui.Legacy, Efl.Ui.Zoom
 {
    [[Elementary map class]]
    legacy_prefix: elm_map;
@@ -348,7 +348,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
          [[Add a new line overlay to the map object.
            This overlay has a line type.
 
-           Overlay created with this method can be deleted with 
+           Overlay created with this method can be deleted with
            \@ref elm_map_overlay_del.
          ]]
          return: ptr(Elm_Map_Overlay); [[The created overlay or $null upon failure.]]
@@ -493,7 +493,7 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable,
            The created overlay has a default style layout before content or
            icon is set. If content or icon is set, those are displayed
            instead of default style layout.
-   
+
            You can set by using \@ref elm_map_overlay_content_set or
            \@ref elm_map_overlay_icon_set. If $null is set, default style
            is shown again.
diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo
index d32faa0762..61684b6ecb 100644
--- a/src/lib/elementary/elm_map_pan.eo
+++ b/src/lib/elementary/elm_map_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Map.Pan (Elm.Pan)
+class Elm.Map.Pan extends Elm.Pan
 {
    [[Elementary map pan class]]
    legacy_prefix: elm_map_pan;
diff --git a/src/lib/elementary/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo
index 70be521d2e..1f59bb8128 100644
--- a/src/lib/elementary/elm_mapbuf.eo
+++ b/src/lib/elementary/elm_mapbuf.eo
@@ -1,4 +1,4 @@
-class Elm.Mapbuf (Efl.Ui.Widget, Efl.Content, Efl.Ui.Legacy)
+class Elm.Mapbuf extends Efl.Ui.Widget implements Efl.Content, Efl.Ui.Legacy
 {
    [[Elementary mapbuf class]]
    legacy_prefix: elm_mapbuf;
diff --git a/src/lib/elementary/elm_mapbuf_part.eo b/src/lib/elementary/elm_mapbuf_part.eo
index aba7f02eb3..a9bc129622 100644
--- a/src/lib/elementary/elm_mapbuf_part.eo
+++ b/src/lib/elementary/elm_mapbuf_part.eo
@@ -1,4 +1,4 @@
-class Elm.Mapbuf.Part (Efl.Ui.Widget_Part, Efl.Content)
+class Elm.Mapbuf.Part extends Efl.Ui.Widget_Part implements Efl.Content
 {
    [[Elementary mapbuf internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo
index f197d5e248..ef0ccacc1f 100644
--- a/src/lib/elementary/elm_menu.eo
+++ b/src/lib/elementary/elm_menu.eo
@@ -1,5 +1,5 @@
-class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable,
-                Efl.Access.Selection, Efl.Ui.Widget_Focus_Manager, Efl.Ui.Legacy)
+class Elm.Menu extends Efl.Ui.Widget implements Efl.Ui.Clickable,
+                Efl.Access.Selection, Efl.Ui.Widget_Focus_Manager, Efl.Ui.Legacy
 {
    [[Elementary menu class]]
    legacy_prefix: elm_menu;
diff --git a/src/lib/elementary/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo
index 84bfbfac52..8bc14ed649 100644
--- a/src/lib/elementary/elm_menu_item.eo
+++ b/src/lib/elementary/elm_menu_item.eo
@@ -1,4 +1,4 @@
-class Elm.Menu.Item(Elm.Widget.Item, Efl.Access.Selection, Efl.Ui.Legacy)
+class Elm.Menu.Item extends Elm.Widget.Item implements Efl.Access.Selection, Efl.Ui.Legacy
 {
    [[Elementary menu item class]]
    legacy_prefix: elm_menu_item;
diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo
index 70d5547e02..8754d0846a 100644
--- a/src/lib/elementary/elm_multibuttonentry.eo
+++ b/src/lib/elementary/elm_multibuttonentry.eo
@@ -1,7 +1,7 @@
 type Elm_Multibuttonentry_Item_Filter_Cb: __undefined_type; [[Elementary multibuttonentry item filter callback type]]
 type Elm_Multibuttonentry_Format_Cb: __undefined_type; [[Elementary multibuttonentry format callback type]]
 
-class Elm.Multibuttonentry (Efl.Ui.Layout, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Multibuttonentry extends Efl.Ui.Layout implements Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Elementary multibuttonentry class]]
    legacy_prefix: elm_multibuttonentry;
diff --git a/src/lib/elementary/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo
index a3dbe7b16c..09e05fdd6c 100644
--- a/src/lib/elementary/elm_multibuttonentry_item.eo
+++ b/src/lib/elementary/elm_multibuttonentry_item.eo
@@ -1,6 +1,6 @@
-class Elm.Multibuttonentry_Item(Elm.Widget.Item,
+class Elm.Multibuttonentry_Item extends Elm.Widget.Item implements
                                 Efl.Access.Widget.Action,
-                                Efl.Ui.Legacy)
+                                Efl.Ui.Legacy
 {
    [[Elementary multibuttonentry class]]
    legacy_prefix: elm_multibuttonentry_item;
diff --git a/src/lib/elementary/elm_multibuttonentry_part.eo b/src/lib/elementary/elm_multibuttonentry_part.eo
index 05d507aa2b..ce1294d413 100644
--- a/src/lib/elementary/elm_multibuttonentry_part.eo
+++ b/src/lib/elementary/elm_multibuttonentry_part.eo
@@ -1,4 +1,4 @@
-class Elm.Multibuttonentry_Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Multibuttonentry_Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary multibuttonentry internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo
index f225295e6a..97b5d35641 100644
--- a/src/lib/elementary/elm_naviframe.eo
+++ b/src/lib/elementary/elm_naviframe.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Naviframe extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary naviframe class]]
    legacy_prefix: elm_naviframe;
diff --git a/src/lib/elementary/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo
index 15c94c9f7b..c35f345761 100644
--- a/src/lib/elementary/elm_naviframe_item.eo
+++ b/src/lib/elementary/elm_naviframe_item.eo
@@ -1,6 +1,6 @@
 type Elm_Naviframe_Item_Pop_Cb: __undefined_type; [[Elementary naviframe item pop callback type]]
 
-class Elm.Naviframe.Item(Elm.Widget.Item, Efl.Ui.Legacy)
+class Elm.Naviframe.Item extends Elm.Widget.Item implements Efl.Ui.Legacy
 {
    [[Elementary naviframe item class]]
    legacy_prefix: elm_naviframe_item;
diff --git a/src/lib/elementary/elm_naviframe_part.eo b/src/lib/elementary/elm_naviframe_part.eo
index 53e5174805..4f17c4ccba 100644
--- a/src/lib/elementary/elm_naviframe_part.eo
+++ b/src/lib/elementary/elm_naviframe_part.eo
@@ -1,4 +1,4 @@
-class Elm.Naviframe.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Naviframe.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary naviframe internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo
index 5cfbf805f1..04d1263bcf 100644
--- a/src/lib/elementary/elm_notify.eo
+++ b/src/lib/elementary/elm_notify.eo
@@ -1,4 +1,4 @@
-class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy)
+class Elm.Notify extends Efl.Ui.Widget implements Efl.Ui.Focus.Layer, Efl.Content, Efl.Ui.Legacy
 {
    [[Elementary notification class]]
    legacy_prefix: elm_notify;
diff --git a/src/lib/elementary/elm_notify_part.eo b/src/lib/elementary/elm_notify_part.eo
index 9ce356d19e..cb9892fe0a 100644
--- a/src/lib/elementary/elm_notify_part.eo
+++ b/src/lib/elementary/elm_notify_part.eo
@@ -1,5 +1,5 @@
-class Elm.Notify.Part (Efl.Ui.Widget_Part, Efl.Content, Efl.Text,
-                       Efl.Ui.L10n)
+class Elm.Notify.Part extends Efl.Ui.Widget_Part implements Efl.Content, Efl.Text,
+                       Efl.Ui.L10n
 {
    [[Elementary notification internel part class]]
    data: null;
diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo
index 81eaad2e5b..086032e0cb 100644
--- a/src/lib/elementary/elm_pan.eo
+++ b/src/lib/elementary/elm_pan.eo
@@ -1,4 +1,4 @@
-class Elm.Pan (Efl.Canvas.Group)
+class Elm.Pan extends Efl.Canvas.Group
 {
    [[Elementary pan class]]
    legacy_prefix: elm_pan;
diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo
index d2d185afdf..05ae83760a 100644
--- a/src/lib/elementary/elm_panel.eo
+++ b/src/lib/elementary/elm_panel.eo
@@ -8,8 +8,8 @@ enum Elm.Panel.Orient
    right [[Panel (dis)appears from the right]]
 }
 
-class Elm.Panel (Efl.Ui.Layout, Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
-                 Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Panel extends Efl.Ui.Layout implements Efl.Ui.Focus.Layer, Elm.Interface_Scrollable,
+                 Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary panel class]]
    legacy_prefix: elm_panel;
diff --git a/src/lib/elementary/elm_panel_part.eo b/src/lib/elementary/elm_panel_part.eo
index 60ec9a3636..a205b22f62 100644
--- a/src/lib/elementary/elm_panel_part.eo
+++ b/src/lib/elementary/elm_panel_part.eo
@@ -1,4 +1,4 @@
-class Elm.Panel.Part (Efl.Ui.Widget_Part, Efl.Content)
+class Elm.Panel.Part extends Efl.Ui.Widget_Part implements Efl.Content
 {
    [[Elementary panel internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_photo.eo b/src/lib/elementary/elm_photo.eo
index bd9e986142..790382d756 100644
--- a/src/lib/elementary/elm_photo.eo
+++ b/src/lib/elementary/elm_photo.eo
@@ -1,5 +1,5 @@
-class Elm.Photo (Efl.Ui.Widget, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable,
-                 Efl.Ui.Legacy)
+class Elm.Photo extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable,
+                 Efl.Ui.Legacy
 {
    [[Elementary photo class]]
    legacy_prefix: elm_photo;
diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo
index bc7c44017b..7876d2329f 100644
--- a/src/lib/elementary/elm_player.eo
+++ b/src/lib/elementary/elm_player.eo
@@ -1,4 +1,4 @@
-class Elm.Player (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Player extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary player class]]
    legacy_prefix: elm_player;
diff --git a/src/lib/elementary/elm_player_part.eo b/src/lib/elementary/elm_player_part.eo
index a09361d66c..ed2cbc3724 100644
--- a/src/lib/elementary/elm_player_part.eo
+++ b/src/lib/elementary/elm_player_part.eo
@@ -1,4 +1,4 @@
-class Elm.Player.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Player.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary player internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo
index d5a54b27b4..5954a8cce0 100644
--- a/src/lib/elementary/elm_plug.eo
+++ b/src/lib/elementary/elm_plug.eo
@@ -1,4 +1,4 @@
-class Elm.Plug (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Legacy)
+class Elm.Plug extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Legacy
 {
    [[Elementary plug class]]
    legacy_prefix: elm_plug;
diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo
index 4469f9c5b3..eab93055c8 100644
--- a/src/lib/elementary/elm_popup.eo
+++ b/src/lib/elementary/elm_popup.eo
@@ -23,7 +23,7 @@ enum Elm.Popup.Orient
 }
 
 
-class Elm.Popup (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Popup extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary popup class]]
    legacy_prefix: elm_popup;
diff --git a/src/lib/elementary/elm_popup_item.eo b/src/lib/elementary/elm_popup_item.eo
index 7668b17d41..b3a408fec4 100644
--- a/src/lib/elementary/elm_popup_item.eo
+++ b/src/lib/elementary/elm_popup_item.eo
@@ -1,4 +1,4 @@
-class Elm.Popup.Item(Elm.Widget.Item, Efl.Ui.Legacy)
+class Elm.Popup.Item extends Elm.Widget.Item implements Efl.Ui.Legacy
 {
    [[Elementary popup item class]]
    legacy_prefix: elm_popup_item;
diff --git a/src/lib/elementary/elm_popup_part.eo b/src/lib/elementary/elm_popup_part.eo
index cf03770f74..8c9210fedd 100644
--- a/src/lib/elementary/elm_popup_part.eo
+++ b/src/lib/elementary/elm_popup_part.eo
@@ -1,4 +1,4 @@
-class Elm.Popup.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Popup.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary popup internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo
index 1867db81c6..78b19ade56 100644
--- a/src/lib/elementary/elm_prefs.eo
+++ b/src/lib/elementary/elm_prefs.eo
@@ -1,7 +1,7 @@
 type Elm_Prefs_Data: __undefined_type; [[Elementary preferences data type]]
 type Elm_Prefs_Reset_Mode: __undefined_type; [[Elementary preferences reset mode type]]
 
-class Elm.Prefs (Efl.Ui.Widget, Efl.File, Efl.Ui.Legacy)
+class Elm.Prefs extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Legacy
 {
    [[Elementary preferences class]]
    legacy_prefix: elm_prefs;
diff --git a/src/lib/elementary/elm_route.eo b/src/lib/elementary/elm_route.eo
index fe41b6a5bf..0df51d4e0f 100644
--- a/src/lib/elementary/elm_route.eo
+++ b/src/lib/elementary/elm_route.eo
@@ -1,4 +1,4 @@
-class Elm.Route (Efl.Ui.Widget, Efl.Ui.Legacy)
+class Elm.Route extends Efl.Ui.Widget implements Efl.Ui.Legacy
 {
    [[Elementary route class]]
    legacy_prefix: elm_route;
diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo
index 51842f6b09..843386f85d 100644
--- a/src/lib/elementary/elm_scroller.eo
+++ b/src/lib/elementary/elm_scroller.eo
@@ -1,6 +1,6 @@
-class Elm.Scroller (Efl.Ui.Layout, Elm.Interface_Scrollable,
+class Elm.Scroller extends Efl.Ui.Layout implements Elm.Interface_Scrollable,
                     Efl.Access.Widget.Action,
-                    Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy)
+                    Efl.Ui.Scrollable, Efl.Content, Efl.Ui.Legacy
 {
    [[Elementary scroller class]]
    legacy_prefix: elm_scroller;
diff --git a/src/lib/elementary/elm_scroller_part.eo b/src/lib/elementary/elm_scroller_part.eo
index f038f7b241..5b2c1b77ab 100644
--- a/src/lib/elementary/elm_scroller_part.eo
+++ b/src/lib/elementary/elm_scroller_part.eo
@@ -1,4 +1,4 @@
-class Elm.Scroller.Part (Efl.Ui.Layout_Part_Legacy)
+class Elm.Scroller.Part extends Efl.Ui.Layout_Part_Legacy
 {
    [[Elementary scroller internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo
index 27b83ac47e..5bbce6f6a0 100644
--- a/src/lib/elementary/elm_segment_control.eo
+++ b/src/lib/elementary/elm_segment_control.eo
@@ -1,4 +1,4 @@
-class Elm.Segment_Control (Efl.Ui.Layout, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Segment_Control extends Efl.Ui.Layout implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Elementary segment control class]]
    legacy_prefix: elm_segment_control;
diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo
index 666737a5ef..971f32ab9e 100644
--- a/src/lib/elementary/elm_segment_control_item.eo
+++ b/src/lib/elementary/elm_segment_control_item.eo
@@ -1,4 +1,4 @@
-class Elm.Segment_Control.Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
+class Elm.Segment_Control.Item extends Elm.Widget.Item implements Efl.Ui.Focus.Object, Efl.Ui.Legacy
 {
    [[Elementary segment control item class]]
    legacy_prefix: elm_segment_control_item;
diff --git a/src/lib/elementary/elm_separator.eo b/src/lib/elementary/elm_separator.eo
index c29585d6b8..56f024dea2 100644
--- a/src/lib/elementary/elm_separator.eo
+++ b/src/lib/elementary/elm_separator.eo
@@ -1,4 +1,4 @@
-class Elm.Separator (Efl.Ui.Layout, Efl.Ui.Legacy)
+class Elm.Separator extends Efl.Ui.Layout implements Efl.Ui.Legacy
 {
    [[Elementary separator class]]
    legacy_prefix: elm_separator;
diff --git a/src/lib/elementary/elm_slider.eo b/src/lib/elementary/elm_slider.eo
index a19ad208ec..52435f9926 100644
--- a/src/lib/elementary/elm_slider.eo
+++ b/src/lib/elementary/elm_slider.eo
@@ -1,5 +1,5 @@
-class Elm.Slider (Efl.Ui.Slider_Interval, Efl.Ui.Legacy,
-                  Efl.Text, Efl.Text_Markup, Efl.Ui.Format)
+class Elm.Slider extends Efl.Ui.Slider_Interval implements Efl.Ui.Legacy,
+                  Efl.Text, Efl.Text_Markup, Efl.Ui.Format
 {
    [[Elementary slider class]]
    eo_prefix: elm_obj_slider;
diff --git a/src/lib/elementary/elm_slider_part_indicator.eo b/src/lib/elementary/elm_slider_part_indicator.eo
index 73698258b6..d899d9d5fe 100644
--- a/src/lib/elementary/elm_slider_part_indicator.eo
+++ b/src/lib/elementary/elm_slider_part_indicator.eo
@@ -1,6 +1,6 @@
 import efl_ui;
 
-class Elm.Slider_Part_Indicator (Efl.Ui.Layout_Part, Efl.Ui.Format)
+class Elm.Slider_Part_Indicator extends Efl.Ui.Layout_Part implements Efl.Ui.Format
 {
    [[Elementary slider internal part class]]
    data: null;
diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo
index b51ee63b71..97cf3cf99c 100644
--- a/src/lib/elementary/elm_slideshow.eo
+++ b/src/lib/elementary/elm_slideshow.eo
@@ -1,6 +1,6 @@
 type Elm_Slideshow_Item_Class: __undefined_type; [[Elementary slideshow item class type]]
 
-class Elm.Slideshow (Efl.Ui.Layout, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Slideshow extends Efl.Ui.Layout implements Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary slideshow class]]
    eo_prefix: elm_obj_slideshow;
diff --git a/src/lib/elementary/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo
index ca3becdcb7..c6d768630f 100644
--- a/src/lib/elementary/elm_slideshow_item.eo
+++ b/src/lib/elementary/elm_slideshow_item.eo
@@ -1,4 +1,4 @@
-class Elm.Slideshow.Item(Elm.Widget.Item)
+class Elm.Slideshow.Item extends Elm.Widget.Item
 {
    [[Elementary slideshow class]]
    legacy_prefix: elm_slideshow_item;
diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo
index 326354f641..612a8ec3ea 100644
--- a/src/lib/elementary/elm_spinner.eo
+++ b/src/lib/elementary/elm_spinner.eo
@@ -1,5 +1,5 @@
-class Elm.Spinner (Efl.Ui.Layout, Efl.Ui.Range, Efl.Ui.Focus.Composition,
-                   Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy)
+class Elm.Spinner extends Efl.Ui.Layout implements Efl.Ui.Range, Efl.Ui.Focus.Composition,
+                   Efl.Access.Value, Efl.Access.Widget.Action, Efl.Ui.Legacy
 {
    [[Elementary spinner class]]
    legacy_prefix: elm_spinner;
diff --git a/src/lib/elementary/elm_sys_notify.eo b/src/lib/elementary/elm_sys_notify.eo
index 17a0db4d3c..cf557a0ab9 100644
--- a/src/lib/elementary/elm_sys_notify.eo
+++ b/src/lib/elementary/elm_sys_notify.eo
@@ -41,7 +41,7 @@ struct Elm.Sys_Notify.Action_Invoked
                                 keys sent over in the list of actions]]
 }
 
-class Elm.Sys_Notify (Efl.Object, Elm.Sys_Notify_Interface)
+class Elm.Sys_Notify extends Efl.Object implements Elm.Sys_Notify_Interface
 {
    [[Elementary system notification class]]
    legacy_prefix: elm_sys_notify;
diff --git a/src/lib/elementary/elm_sys_notify_dbus.eo b/src/lib/elementary/elm_sys_notify_dbus.eo
index 3c7ddb9079..eea26674b0 100644
--- a/src/lib/elementary/elm_sys_notify_dbus.eo
+++ b/src/lib/elementary/elm_sys_notify_dbus.eo
@@ -1,4 +1,4 @@
-class Elm.Sys_Notify.Dbus (Efl.Object, Elm.Sys_Notify_Interface)
+class Elm.Sys_Notify.Dbus extends Efl.Object implements Elm.Sys_Notify_Interface
 {
    [[Elementary system notification DBus class]]
    legacy_prefix: elm_sys_notify_dbus;
diff --git a/src/lib/elementary/elm_systray.eo b/src/lib/elementary/elm_systray.eo
index 84f7302d8b..076177fa71 100644
--- a/src/lib/elementary/elm_systray.eo
+++ b/src/lib/elementary/elm_systray.eo
@@ -22,7 +22,7 @@ enum Elm.Systray.Status
    attention [[Needs Attention]]
 }
 
-class Elm.Systray (Efl.Object)
+class Elm.Systray extends Efl.Object
 {
    [[Elementary systray class]]
    legacy_prefix: elm_systray;
diff --git a/src/lib/elementary/elm_table.eo b/src/lib/elementary/elm_table.eo
index 7eaae08231..4f68be9eb5 100644
--- a/src/lib/elementary/elm_table.eo
+++ b/src/lib/elementary/elm_table.eo
@@ -1,4 +1,4 @@
-class Elm.Table (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Efl.Ui.Legacy)
+class Elm.Table extends Efl.Ui.Widget implements Efl.Ui.Focus.Composition, Efl.Ui.Legacy
 {
    [[Elementary table class]]
    legacy_prefix: elm_table;
diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo
index 674f2ec4ab..94e911e736 100644
--- a/src/lib/elementary/elm_thumb.eo
+++ b/src/lib/elementary/elm_thumb.eo
@@ -1,5 +1,5 @@
-class Elm.Thumb (Efl.Ui.Layout, Efl.File, Efl.Ui.Clickable,
-                 Efl.Ui.Draggable, Efl.Ui.Legacy)
+class Elm.Thumb extends Efl.Ui.Layout implements Efl.File, Efl.Ui.Clickable,
+                 Efl.Ui.Draggable, Efl.Ui.Legacy
 {
    [[Elementary thumbnail class]]
    legacy_prefix: elm_thumb;
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 1c70d47dc8..e70dafc6e4 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -23,9 +23,9 @@ enum Elm.Toolbar_Shrink_Mode
    last [[Indicates error if returned by elm_toolbar_shrink_mode_get()]]
 }
 
-class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction,
+class Elm.Toolbar extends Efl.Ui.Widget implements Efl.Ui.Focus.Composition, Elm.Interface_Scrollable, Efl.Ui.Direction,
                    Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Access.Object,
-                   Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy)
+                   Efl.Ui.Clickable, Efl.Ui.Selectable, Efl.Ui.Legacy
 {
    [[Elementary toolbar class]]
    legacy_prefix: elm_toolbar;
diff --git a/src/lib/elementary/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo
index 8154c53615..6abdc3981b 100644
--- a/src/lib/elementary/elm_toolbar_item.eo
+++ b/src/lib/elementary/elm_toolbar_item.eo
@@ -23,7 +23,7 @@ struct Elm.Toolbar_Item_State
    data: const(void_ptr); [[Item data]]
 }
 
-class Elm.Toolbar_Item(Elm.Widget.Item, Efl.Ui.Focus.Object, Efl.Ui.Legacy)
+class Elm.Toolbar_Item extends Elm.Widget.Item implements Efl.Ui.Focus.Object, Efl.Ui.Legacy
 {
       [[Elementary toolbar item class]]
       legacy_prefix: elm_toolbar_item;
diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo
index bdc4183fd7..a6bf4cc6df 100644
--- a/src/lib/elementary/elm_view_form.eo
+++ b/src/lib/elementary/elm_view_form.eo
@@ -1,4 +1,4 @@
-class Elm.View.Form (Efl.Object)
+class Elm.View.Form extends Efl.Object
 {
     [[Elementary view form class]]
     methods {
diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo
index 1354963429..7a8e777b4d 100644
--- a/src/lib/elementary/elm_view_list.eo
+++ b/src/lib/elementary/elm_view_list.eo
@@ -1,6 +1,6 @@
 import elm_general;
 
-class Elm.View.List (Efl.Object)
+class Elm.View.List extends Efl.Object
 {
     [[Elementary view list class]]
     methods {
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index e409481008..7f221e26d5 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -4,8 +4,8 @@ import efl_ui;
 type Elm_Tooltip_Item_Content_Cb: __undefined_type; [[Elementary tooltip item content callback type]]
 type Elm_Object_Item_Signal_Cb: __undefined_type; [[Elementary object item signal callback type]]
 
-class Elm.Widget.Item(Efl.Object, Efl.Access.Object,
-                      Efl.Access.Component)
+class Elm.Widget.Item extends Efl.Object implements Efl.Access.Object,
+                      Efl.Access.Component
 {
       [[Elementary widget item class]]
       eo_prefix: elm_wdg_item;
diff --git a/src/lib/elementary/elm_widget_item_static_focus.eo b/src/lib/elementary/elm_widget_item_static_focus.eo
index 51d0fd0e46..4722e9690d 100644
--- a/src/lib/elementary/elm_widget_item_static_focus.eo
+++ b/src/lib/elementary/elm_widget_item_static_focus.eo
@@ -1,4 +1,4 @@
-class Elm.Widget.Item.Static_Focus (Elm.Widget.Item, Efl.Ui.Focus.Object)
+class Elm.Widget.Item.Static_Focus extends Elm.Widget.Item implements Efl.Ui.Focus.Object
 {
    [[A class that ensures that at least ONE focusable target is behind this widget item. If there is none registered to it after a prepare call it will register the view of the item as item.]]
    implements {
diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo
index 4b30936823..b9701302f7 100644
--- a/src/lib/emotion/efl_canvas_video.eo
+++ b/src/lib/emotion/efl_canvas_video.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller)
+class Efl.Canvas.Video extends Efl.Canvas.Group implements Efl.File, Efl.Player, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller
 {
    [[Efl canvas video class]]
    methods {
diff --git a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
index 2ef971e013..1a4acfa73d 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_alpha.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Alpha (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Alpha extends Efl.Canvas.Animation
 {
    [[Efl alpha animation class]]
    eo_prefix: efl_animation_alpha;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
index 98700ec8b9..833c85f960 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_parallel.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Group_Parallel (Efl.Canvas.Animation_Group)
+class Efl.Canvas.Animation_Group_Parallel extends Efl.Canvas.Animation_Group
 {
    [[Efl group parallel animation class]]
    eo_prefix: efl_animation_group_parallel;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
index 8cdce7f0f5..81144e327f 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_group_sequential.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Group_Sequential (Efl.Canvas.Animation_Group)
+class Efl.Canvas.Animation_Group_Sequential extends Efl.Canvas.Animation_Group
 {
    [[Efl group sequential animation class]]
    data: null;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo
index a8e6dee9e8..fe4fb90d4d 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_player.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player)
+class Efl.Canvas.Animation_Player extends Efl.Object implements Efl.Player
 {
    [[Efl animation object class]]
    eo_prefix: efl_animation_player;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
index c7f9da197c..e37720f03f 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_rotate.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Rotate (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Rotate extends Efl.Canvas.Animation
 {
    [[Efl rotate animation class]]
    eo_prefix: efl_animation_rotate;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_scale.eo b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
index 79a4d2247b..7ffe2cb39f 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_scale.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_scale.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Scale (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Scale extends Efl.Canvas.Animation
 {
    [[Efl scale animation class]]
    eo_prefix: efl_animation_scale;
diff --git a/src/lib/evas/canvas/efl_canvas_animation_translate.eo b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
index 29276c4ec3..822fbd4f85 100644
--- a/src/lib/evas/canvas/efl_canvas_animation_translate.eo
+++ b/src/lib/evas/canvas/efl_canvas_animation_translate.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Animation_Translate (Efl.Canvas.Animation)
+class Efl.Canvas.Animation_Translate extends Efl.Canvas.Animation
 {
    [[Efl translate animation class]]
    eo_prefix: efl_animation_translate;
diff --git a/src/lib/evas/canvas/efl_canvas_event_grabber.eo b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
index f756820815..24a2a8ff3b 100644
--- a/src/lib/evas/canvas/efl_canvas_event_grabber.eo
+++ b/src/lib/evas/canvas/efl_canvas_event_grabber.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Event_Grabber (Efl.Canvas.Group)
+class Efl.Canvas.Event_Grabber extends Efl.Canvas.Group
 {
    [[Low-level rectangle object.
 
diff --git a/src/lib/evas/canvas/efl_canvas_group.eo b/src/lib/evas/canvas/efl_canvas_group.eo
index eecb255ad3..2823f7e71d 100644
--- a/src/lib/evas/canvas/efl_canvas_group.eo
+++ b/src/lib/evas/canvas/efl_canvas_group.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Group (Efl.Canvas.Object)
+class Efl.Canvas.Group extends Efl.Canvas.Object
 {
    [[A group object is a container for other canvas objects. Its children
      move along their parent and are often clipped with a common clipper.
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo b/src/lib/evas/canvas/efl_canvas_image.eo
index 4ada80bc2c..21cdd85876 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -1,6 +1,6 @@
-class Efl.Canvas.Image (Efl.Canvas.Image_Internal,
+class Efl.Canvas.Image extends Efl.Canvas.Image_Internal implements
                         Efl.Gfx.Image_Load_Controller, Efl.Gfx.Image_Animation_Controller,
-                        Efl.File)
+                        Efl.File
 {
    [[Low-level Image object.
 
diff --git a/src/lib/evas/canvas/efl_canvas_polygon.eo b/src/lib/evas/canvas/efl_canvas_polygon.eo
index d227014494..668ac95090 100644
--- a/src/lib/evas/canvas/efl_canvas_polygon.eo
+++ b/src/lib/evas/canvas/efl_canvas_polygon.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Polygon (Efl.Canvas.Object)
+class Efl.Canvas.Polygon extends Efl.Canvas.Object
 {
    [[Low-level polygon object]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_proxy.eo b/src/lib/evas/canvas/efl_canvas_proxy.eo
index 62fcc0db02..9c3f9a3f0e 100644
--- a/src/lib/evas/canvas/efl_canvas_proxy.eo
+++ b/src/lib/evas/canvas/efl_canvas_proxy.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Proxy (Efl.Canvas.Image_Internal)
+class Efl.Canvas.Proxy extends Efl.Canvas.Image_Internal
 {
    [[Low-level proxy image object.
 
diff --git a/src/lib/evas/canvas/efl_canvas_rectangle.eo b/src/lib/evas/canvas/efl_canvas_rectangle.eo
index 0430a53dab..181481d688 100644
--- a/src/lib/evas/canvas/efl_canvas_rectangle.eo
+++ b/src/lib/evas/canvas/efl_canvas_rectangle.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Rectangle (Efl.Canvas.Object)
+class Efl.Canvas.Rectangle extends Efl.Canvas.Object
 {
    [[Evas canvas rectangle class]]
    implements {
diff --git a/src/lib/evas/canvas/efl_canvas_scene3d.eo b/src/lib/evas/canvas/efl_canvas_scene3d.eo
index 7ad87e87fc..4fb08435d9 100644
--- a/src/lib/evas/canvas/efl_canvas_scene3d.eo
+++ b/src/lib/evas/canvas/efl_canvas_scene3d.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Scene3d (Efl.Canvas.Image_Internal)
+class Efl.Canvas.Scene3d extends Efl.Canvas.Image_Internal
 {
    [[A UI view for EFL Canvas 3D.]]
    data: null;
diff --git a/src/lib/evas/canvas/efl_canvas_snapshot.eo b/src/lib/evas/canvas/efl_canvas_snapshot.eo
index 49271ed3fa..147f58ed77 100644
--- a/src/lib/evas/canvas/efl_canvas_snapshot.eo
+++ b/src/lib/evas/canvas/efl_canvas_snapshot.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Snapshot (Efl.Canvas.Image_Internal)
+class Efl.Canvas.Snapshot extends Efl.Canvas.Image_Internal
 {
    [[Low-level snapshot image object.
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
index 7a3a8ee56f..6171c1ec88 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Surface_Tbm (Efl.Canvas.Surface)
+class Efl.Canvas.Surface_Tbm extends Efl.Canvas.Surface
 {
    [[Native Tizen Buffer Manager surface for Efl canvas]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
index e731898582..882d4c8e27 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Surface_Wayland (Efl.Canvas.Surface)
+class Efl.Canvas.Surface_Wayland extends Efl.Canvas.Surface
 {
    [[Native Wayland surface for Efl canvas]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
index 22b3586497..64fe4efdf9 100644
--- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo
+++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo
@@ -5,7 +5,7 @@ struct Efl.Canvas.Surface_X11_Pixmap
    pixmap: ulong;  [[X11 Pixmap ID.]]
 }
 
-class Efl.Canvas.Surface_X11 (Efl.Canvas.Surface)
+class Efl.Canvas.Surface_X11 extends Efl.Canvas.Surface
 {
    [[Native X11 surface for Efl canvas]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 4e9b822350..9e569a67bf 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -2,10 +2,10 @@ import efl_text_types;
 
 struct Efl.Canvas.Text_Style; [[EFL text style data structure]]
 
-class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text,
+class Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text,
                        Efl.Canvas.Filter.Internal, Efl.Text_Font,
                        Efl.Text_Style, Efl.Text_Format, Efl.Text_Cursor,
-                       Efl.Text_Annotate, Efl.Text_Markup, Efl.Ui.I18n)
+                       Efl.Text_Annotate, Efl.Text_Markup, Efl.Ui.I18n
 {
    [[Efl canvas text class]]
    legacy_prefix: evas_object_textblock;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_container.eo b/src/lib/evas/canvas/efl_canvas_vg_container.eo
index 3d26efdd8e..3c24c03a2b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_container.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_container.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Vg.Container (Efl.Canvas.Vg.Node)
+class Efl.Canvas.Vg.Container extends Efl.Canvas.Vg.Node
 {
    [[Efl vector graphics container class]]
    legacy_prefix: evas_vg_container;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
index 3dab9b4907..2fa9a7122c 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_linear.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Vg.Gradient_Linear (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient_Linear)
+class Efl.Canvas.Vg.Gradient_Linear extends Efl.Canvas.Vg.Gradient implements Efl.Gfx.Gradient_Linear
 {
    [[Efl vector graphics gradient linear class]]
    legacy_prefix: evas_vg_gradient_linear;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
index de631edf83..07df740238 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_gradient_radial.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Vg.Gradient_Radial (Efl.Canvas.Vg.Gradient, Efl.Gfx.Gradient_Radial)
+class Efl.Canvas.Vg.Gradient_Radial extends Efl.Canvas.Vg.Gradient implements Efl.Gfx.Gradient_Radial
 {
    [[Efl vector graphics gradient radial class]]
    legacy_prefix: evas_vg_gradient_radial;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_object.eo b/src/lib/evas/canvas/efl_canvas_vg_object.eo
index 971c977daf..a1038efd8c 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_object.eo
@@ -21,7 +21,7 @@ enum Efl.Canvas.Vg.Fill_Mode
                   dimension of the viewport.]]
 }
 
-class Efl.Canvas.Vg.Object (Efl.Canvas.Object, Efl.File)
+class Efl.Canvas.Vg.Object extends Efl.Canvas.Object implements Efl.File
 {
    [[Efl vector graphics class]]
    legacy_prefix: evas_object_vg;
diff --git a/src/lib/evas/canvas/efl_canvas_vg_shape.eo b/src/lib/evas/canvas/efl_canvas_vg_shape.eo
index 2997071da0..0d95a6eb0b 100644
--- a/src/lib/evas/canvas/efl_canvas_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_canvas_vg_shape.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Vg.Shape (Efl.Canvas.Vg.Node, Efl.Gfx.Shape)
+class Efl.Canvas.Vg.Shape extends Efl.Canvas.Vg.Node implements Efl.Gfx.Shape
 {
    [[Efl vector graphics shape class]]
    legacy_prefix: evas_vg_shape;
diff --git a/src/lib/evas/canvas/efl_input_focus.eo b/src/lib/evas/canvas/efl_input_focus.eo
index fe6475232b..28bf5d391c 100644
--- a/src/lib/evas/canvas/efl_input_focus.eo
+++ b/src/lib/evas/canvas/efl_input_focus.eo
@@ -1,4 +1,4 @@
-class Efl.Input.Focus(Efl.Object, Efl.Input.Event)
+class Efl.Input.Focus extends Efl.Object implements Efl.Input.Event
 {
    [[Represents a focus event. @since 1.19]]
    methods {
diff --git a/src/lib/evas/canvas/efl_input_hold.eo b/src/lib/evas/canvas/efl_input_hold.eo
index f320d061fe..9649d75cb6 100644
--- a/src/lib/evas/canvas/efl_input_hold.eo
+++ b/src/lib/evas/canvas/efl_input_hold.eo
@@ -1,4 +1,4 @@
-class Efl.Input.Hold (Efl.Object, Efl.Input.Event)
+class Efl.Input.Hold extends Efl.Object implements Efl.Input.Event
 {
    [[Event data sent when inputs are put on hold or resumed.]]
    methods {
diff --git a/src/lib/evas/canvas/efl_input_key.eo b/src/lib/evas/canvas/efl_input_key.eo
index 501a188a3e..29b7d85dd3 100644
--- a/src/lib/evas/canvas/efl_input_key.eo
+++ b/src/lib/evas/canvas/efl_input_key.eo
@@ -1,4 +1,4 @@
-class Efl.Input.Key (Efl.Object, Efl.Input.Event, Efl.Input.State)
+class Efl.Input.Key extends Efl.Object implements Efl.Input.Event, Efl.Input.State
 {
    [[Represents a single key event from a keyboard or similar device.
 
diff --git a/src/lib/evas/canvas/efl_input_pointer.eo b/src/lib/evas/canvas/efl_input_pointer.eo
index 03516b62a7..cda511b6bc 100644
--- a/src/lib/evas/canvas/efl_input_pointer.eo
+++ b/src/lib/evas/canvas/efl_input_pointer.eo
@@ -1,6 +1,6 @@
 import efl_input_types;
 
-class Efl.Input.Pointer (Efl.Object, Efl.Input.Event, Efl.Input.State)
+class Efl.Input.Pointer extends Efl.Object implements Efl.Input.Event, Efl.Input.State
 {
    [[Event data carried over with any pointer event (mouse, touch, pen, ...)
 
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 67d929ef74..427bd4b57f 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; [[Evas object box layout
 type @extern Eina_Free_Cb: __undefined_type; [[Eina free callback type]] /* FIXME: Function pointers are not supported  */
 type @extern va_list: __undefined_type; [[va_list type]] /* FIXME: va_list is not supported */
 
-class Evas.Box (Efl.Canvas.Group)
+class Evas.Box extends Efl.Canvas.Group
 {
    [[Evas box class]]
    legacy_prefix: evas_object_box;
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index eb3d6ffa72..32e7347504 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1,7 +1,7 @@
 import efl_input_types;
 
-class Evas.Canvas (Efl.Loop_Consumer, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface,
-                   Efl.Canvas.Pointer)
+class Evas.Canvas extends Efl.Loop_Consumer implements Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface,
+                   Efl.Canvas.Pointer
 {
    [[Evas canvas class]]
    legacy_prefix: evas;
diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.eo b/src/lib/evas/canvas/evas_canvas3d_camera.eo
index b427e8b167..6ad777b0a6 100644
--- a/src/lib/evas/canvas/evas_canvas3d_camera.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_camera.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-class Evas.Canvas3D.Camera (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Camera extends Evas.Canvas3D.Object
 {
    [[Evas 3D canvas camera class]]
    data: Evas_Canvas3D_Camera_Data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_light.eo b/src/lib/evas/canvas/evas_canvas3d_light.eo
index 371040c6c6..23525fdc84 100644
--- a/src/lib/evas/canvas/evas_canvas3d_light.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_light.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-class Evas.Canvas3D.Light (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Light extends Evas.Canvas3D.Object
 {
    [[Evas 3D canvas light class]]
 
diff --git a/src/lib/evas/canvas/evas_canvas3d_material.eo b/src/lib/evas/canvas/evas_canvas3d_material.eo
index b2d209099d..9d377f324b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_material.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_material.eo
@@ -1,4 +1,4 @@
-class Evas.Canvas3D.Material (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Material extends Evas.Canvas3D.Object
 {
    [[Evas 3D canvas material class]]
    data: Evas_Canvas3D_Material_Data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.eo b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
index 04771d7d45..c1b02b2f9c 100644
--- a/src/lib/evas/canvas/evas_canvas3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_mesh.eo
@@ -2,7 +2,7 @@ import evas_canvas3d_types;
 
 struct @extern Eina.Inarray; [[Eina inarray data structure]]
 
-class Evas.Canvas3D.Mesh (Evas.Canvas3D.Object, Efl.File)
+class Evas.Canvas3D.Mesh extends Evas.Canvas3D.Object implements Efl.File
 {
    [[Evas 3D canvas mesh class]]
    data: Evas_Canvas3D_Mesh_Data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_node.eo b/src/lib/evas/canvas/evas_canvas3d_node.eo
index 98f27483f4..31400b9bad 100644
--- a/src/lib/evas/canvas/evas_canvas3d_node.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_node.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-class Evas.Canvas3D.Node (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Node extends Evas.Canvas3D.Object
 {
    [[Evas 3D canvas node class]]
    data: Evas_Canvas3D_Node_Data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_primitive.eo b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
index 11960f88b9..b3c4c5a24b 100644
--- a/src/lib/evas/canvas/evas_canvas3d_primitive.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_primitive.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Primitive extends Evas.Canvas3D.Object
 {
    [[Evas 3D canvas primitive class]]
    data: Evas_Canvas3D_Primitive_Data;
@@ -59,7 +59,7 @@ class Evas.Canvas3D.Primitive (Evas.Canvas3D.Object)
                major radius and minor radius. For this usage
                Available values is from 1.0 to infinity.
                If ratio for torus has a bad value,
-               3.0 will be used as the ratio. 
+               3.0 will be used as the ratio.
 
                Default ratio is 3.0.]]
          }
diff --git a/src/lib/evas/canvas/evas_canvas3d_scene.eo b/src/lib/evas/canvas/evas_canvas3d_scene.eo
index 4ac2838b5e..0ded4aa830 100644
--- a/src/lib/evas/canvas/evas_canvas3d_scene.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_scene.eo
@@ -1,6 +1,6 @@
 import evas_canvas3d_types;
 
-class Evas.Canvas3D.Scene (Evas.Canvas3D.Object)
+class Evas.Canvas3D.Scene extends Evas.Canvas3D.Object
 {
    [[Efl 3D canvas scene class]]
    data: Evas_Canvas3D_Scene_Data;
diff --git a/src/lib/evas/canvas/evas_canvas3d_texture.eo b/src/lib/evas/canvas/evas_canvas3d_texture.eo
index 22b35f2219..0b22e86d1e 100644
--- a/src/lib/evas/canvas/evas_canvas3d_texture.eo
+++ b/src/lib/evas/canvas/evas_canvas3d_texture.eo
@@ -1,6 +1,6 @@
 type @extern Evas_Colorspace: int; [[Evas colorspace type]] /* FIXME: Need to get emile migrated. */
 
-class Evas.Canvas3D.Texture (Evas.Canvas3D.Object, Efl.File)
+class Evas.Canvas3D.Texture extends Evas.Canvas3D.Object implements Efl.File
 {
    [[Evas 3d canvas texture class]]
    data : Evas_Canvas3D_Texture_Data;
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 1d5f1051b2..74ea3316a3 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -1,4 +1,4 @@
-class Evas.Grid (Efl.Canvas.Group)
+class Evas.Grid extends Efl.Canvas.Group
 {
    [[Evas grid class]]
    legacy_prefix: evas_object_grid;
diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo
index e54d35a305..f7163b7e50 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -1,4 +1,4 @@
-class Evas.Image (Efl.Canvas.Image_Internal, Efl.File)
+class Evas.Image extends Efl.Canvas.Image_Internal implements Efl.File
 {
    [[Internal class for legacy support of Evas Image.]]
    data: null;
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index 9f6b65825e..6274969509 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -1,4 +1,4 @@
-class Evas.Line (Efl.Canvas.Object)
+class Evas.Line extends Efl.Canvas.Object
 {
    [[Evas line class]]
    legacy_prefix: evas_object_line;
diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo
index 9a4d770c8f..fe33a00907 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode {
      item = 2 [[Item mode]]
 }
 
-class Evas.Table (Efl.Canvas.Group)
+class Evas.Table extends Efl.Canvas.Group
 {
    [[Evas table class]]
    legacy_prefix: evas_object_table;
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 54dc89e263..9d9b7cca7d 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -1,7 +1,7 @@
 type @extern Evas.Text_Style_Type : __undefined_type; [[External text style type]]
 
-class Evas.Text (Efl.Canvas.Object, Efl.Text,
-                 Efl.Text_Font, Efl.Canvas.Filter.Internal)
+class Evas.Text extends Efl.Canvas.Object implements Efl.Text,
+                 Efl.Text_Font, Efl.Canvas.Filter.Internal
 {
    [[Evas text class]]
    legacy_prefix: evas_object_text;
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index ebd482ec19..5d4ea33ede 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style {
 /* XXX: Actual definition is in C. */
 struct Evas.Textgrid.Cell; [[Evas textgrid cell data structure]]
 
-class Evas.Textgrid (Efl.Canvas.Object, Efl.Text_Font)
+class Evas.Textgrid extends Efl.Canvas.Object implements Efl.Text_Font
 {
    [[Evas textgrid class]]
    legacy_prefix: evas_object_textgrid;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
index 5edcbcf8e9..944723508c 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Gesture_Long_Tap (Efl.Canvas.Gesture)
+class Efl.Canvas.Gesture_Long_Tap extends Efl.Canvas.Gesture
 {
    [[EFL Gesture Long Tap class]]
    eo_prefix: efl_gesture_long_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index 5084083a38..3804e228da 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Gesture_Manager (Efl.Object)
+class Efl.Canvas.Gesture_Manager extends Efl.Object
 {
    [[EFL Gesture Manager class]]
    eo_prefix: efl_gesture_manager;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
index 6991b8fda2..72cea52895 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Gesture_Recognizer_Long_Tap (Efl.Canvas.Gesture_Recognizer)
+class Efl.Canvas.Gesture_Recognizer_Long_Tap extends Efl.Canvas.Gesture_Recognizer
 {
    [[EFL Gesture Recognizer Long Tap class]]
    data: null;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
index 7926bb62a9..62e84ec9a9 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Gesture_Recognizer_Tap (Efl.Canvas.Gesture_Recognizer)
+class Efl.Canvas.Gesture_Recognizer_Tap extends Efl.Canvas.Gesture_Recognizer
 {
    [[EFL Gesture Recognizer Tap class]]
    data: null;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
index 60bcdcacfe..d22f075dd6 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo
@@ -1,4 +1,4 @@
-class Efl.Canvas.Gesture_Tap(Efl.Canvas.Gesture)
+class Efl.Canvas.Gesture_Tap extends Efl.Canvas.Gesture
 {
    [[EFL Gesture Tap class]]
    eo_prefix: efl_gesture_tap;
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
index d18001759b..f606a60ede 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_touch.eo
@@ -3,7 +3,7 @@ import efl_input_types;
 
 /* FIXME: This class lacks a lot of useful helpers. */
 
-class Efl.Canvas.Gesture_Touch(Efl.Object)
+class Efl.Canvas.Gesture_Touch extends Efl.Object
 {
    [[EFL Gesture Touch class]]
    eo_prefix: efl_gesture_touch;
diff --git a/src/modules/elementary/web/none/elm_web_none.eo b/src/modules/elementary/web/none/elm_web_none.eo
index e072be2c5f..d00d2d68a0 100644
--- a/src/modules/elementary/web/none/elm_web_none.eo
+++ b/src/modules/elementary/web/none/elm_web_none.eo
@@ -1,4 +1,4 @@
-class Elm.Web.None (Elm.Web, Efl.Ui.Legacy)
+class Elm.Web.None extends Elm.Web implements Efl.Ui.Legacy
 {
    [[Elementary web module class]]
    implements {
diff --git a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
index 938cd3a4e8..b42aeaa9fa 100644
--- a/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
+++ b/src/modules/evas/engines/software_generic/evas_ector_software_buffer.eo
@@ -1,4 +1,4 @@
-class Evas.Ector.Software.Buffer (Ector.Software.Buffer, Evas.Ector.Buffer)
+class Evas.Ector.Software.Buffer extends Ector.Software.Buffer implements Evas.Ector.Buffer
 {
    [[A buffer object wrapping an existing Evas Image_Entry.]]
    implements {
diff --git a/src/tests/eolian/data/class_requires.eo b/src/tests/eolian/data/class_requires.eo
index 173c660b39..ffbb4fef8d 100644
--- a/src/tests/eolian/data/class_requires.eo
+++ b/src/tests/eolian/data/class_requires.eo
@@ -1,7 +1,7 @@
 import base;
 import mixins_require;
 
-class Class.Requires (Base, Mixins.Require) {
+class Class.Requires extends Base implements Mixins.Require {
   methods {
 
   }
diff --git a/src/tests/eolian/data_aux/aux_a.eo b/src/tests/eolian/data_aux/aux_a.eo
index 2ff081f9d8..b79d8877e3 100644
--- a/src/tests/eolian/data_aux/aux_a.eo
+++ b/src/tests/eolian/data_aux/aux_a.eo
@@ -1,4 +1,4 @@
-class Aux_A(Aux_C) {
+class Aux_A extends Aux_C  {
     methods {
         baz {}
     }
diff --git a/src/tests/eolian/data_aux/aux_b.eo b/src/tests/eolian/data_aux/aux_b.eo
index 4c225d3c18..728c465790 100644
--- a/src/tests/eolian/data_aux/aux_b.eo
+++ b/src/tests/eolian/data_aux/aux_b.eo
@@ -1,2 +1,2 @@
-class Aux_B(Aux_C) {
+class Aux_B extends Aux_C  {
 }