Efl.Loop_* (from Efl.Loop.*)

Ref https://phab.enlightenment.org/T6847

Reviewed-by: Cedric Bail <cedric@osg.samsung.com>

36 files changed, 59 insertions, 59 deletions

diff --git a/src/lib/ecore/ecore_event_message.eo b/src/lib/ecore/ecore_event_message.eo
index 002197a122..c1359b005f 100644
--- a/src/lib/ecore/ecore_event_message.eo
+++ b/src/lib/ecore/ecore_event_message.eo
@@ -1,7 +1,7 @@
 import efl_types;
 import eina_types;
 
-class Ecore.Event.Message (Efl.Loop.Message)
+class Ecore.Event.Message (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 7854c4113c..2601ae9e8f 100644
--- a/src/lib/ecore/ecore_event_message_handler.eo
+++ b/src/lib/ecore/ecore_event_message_handler.eo
@@ -1,7 +1,7 @@
 import efl_types;
 import eina_types;
 
-class Ecore.Event.Message.Handler (Efl.Loop.Message.Handler)
+class Ecore.Event.Message.Handler (Efl.Loop_Message_Handler)
 {
    [[ For Legacy API usage Only
       This class is rather hacky/messy as it's really internal glue
@@ -90,6 +90,6 @@ class Ecore.Event.Message.Handler (Efl.Loop.Message.Handler)
    implements {
       Efl.Object.constructor;
       Efl.Object.destructor;
-      Efl.Loop.Message.Handler.message_call; [[ Sample - override this ]]
+      Efl.Loop_Message_Handler.message_call; [[ Sample - override this ]]
    }
 }
diff --git a/src/lib/ecore/efl_io_buffered_stream.eo b/src/lib/ecore/efl_io_buffered_stream.eo
index b4f1ed951a..36d426306c 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 (Efl.Loop_Consumer, 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 0ddafcd67e..345775eb77 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 (Efl.Loop_Consumer, 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 82b011c98b..4040f5dc86 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 (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) {
     [[File access (open, close, read, write, lseek, ftruncate)
 
       @Efl.Io.Closer.close_on_exec and
@@ -50,7 +50,7 @@ class Efl.Io.File (Efl.Loop.Fd, Efl.File, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Ef
         Efl.Object.constructor;
         Efl.Object.destructor;
         Efl.Object.finalize;
-        Efl.Loop.Fd.fd_file { set; }
+        Efl.Loop_Fd.fd_file { set; }
         Efl.File.file { get; set; }
         Efl.Io.Reader.read;
         Efl.Io.Writer.write;
diff --git a/src/lib/ecore/efl_io_stderr.eo b/src/lib/ecore/efl_io_stderr.eo
index 16518da124..8b92505596 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 (Efl.Loop_Fd, Efl.Io.Writer_Fd) {
     [[Application's standard error (stderr).
 
       @since 1.19
@@ -8,7 +8,7 @@ class Efl.Io.Stderr (Efl.Loop.Fd, Efl.Io.Writer_Fd) {
 
     implements {
         Efl.Object.finalize;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Io.Writer.write;
         Efl.Io.Writer.can_write { set; }
     }
diff --git a/src/lib/ecore/efl_io_stdin.eo b/src/lib/ecore/efl_io_stdin.eo
index 24d29afeac..8389ed2954 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 (Efl.Loop_Fd, Efl.Io.Reader_Fd) {
     [[Application's standard input (stdin).
 
       @since 1.19
@@ -8,7 +8,7 @@ class Efl.Io.Stdin (Efl.Loop.Fd, Efl.Io.Reader_Fd) {
 
     implements {
         Efl.Object.finalize;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Io.Reader.read;
         Efl.Io.Reader.can_read { set; }
     }
diff --git a/src/lib/ecore/efl_io_stdout.eo b/src/lib/ecore/efl_io_stdout.eo
index c5f390df10..d98528179a 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 (Efl.Loop_Fd, Efl.Io.Writer_Fd) {
     [[Application's standard output (stdout).
 
       @since 1.19
@@ -8,7 +8,7 @@ class Efl.Io.Stdout (Efl.Loop.Fd, Efl.Io.Writer_Fd) {
 
     implements {
         Efl.Object.finalize;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Io.Writer.write;
         Efl.Io.Writer.can_write { set; }
     }
diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 5ff89fe3ed..6da5da49d9 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -1,7 +1,7 @@
 import efl_types;
 import eina_types;
 
-struct Efl.Loop.Arguments {
+struct Efl.Loop_Arguments {
    [[EFL loop arguments data structure]]
    argv: const(array<const(stringshare)>); [[Array with loop arguments]]
    initialization: bool; [[Set to $true when the program should initialize its internal state. This happen once per process instance.]]
@@ -110,14 +110,14 @@ class Efl.Loop (Efl.Task)
             @in loop: Efl.Loop; [[The loop to get the object from.]]
             @in klass: const(Efl.Class); [[The class of the message object.]]
          }
-         return: Efl.Loop.Message.Handler; [[The message handler to use.]]
+         return: Efl.Loop_Message_Handler; [[The message handler to use.]]
       }
    }
    events {
       idle,enter @restart; [[Event occurs once the main loop enters the idle state.]]
       idle,exit @restart; [[Event occurs once the main loop exits the idle state.]]
       idle @restart; [[Event occurs once the main loop is idle. If you keep listening on this event it may increase the burden on your CPU.]]
-      arguments: Efl.Loop.Arguments; [[Event happens when args are provided to the loop by args_add().]]
+      arguments: Efl.Loop_Arguments; [[Event happens when args are provided to the loop by args_add().]]
       poll,high; [[Event occurs multiple times per second. The exact tick is undefined and can be adjusted system wide.]]
       poll,medium; [[Event occurs multiple times per minute. The exact tick is undefined and can be adjusted system wide.]]
       poll,low; [[Event occurs multiple times every 15 minutes. The exact tick is undefined and can be adjusted system wide.]]
diff --git a/src/lib/ecore/efl_loop_consumer.eo b/src/lib/ecore/efl_loop_consumer.eo
index 52aa619bae..e486567ed5 100644
--- a/src/lib/ecore/efl_loop_consumer.eo
+++ b/src/lib/ecore/efl_loop_consumer.eo
@@ -1,6 +1,6 @@
-class Efl.Loop.Consumer (Efl.Object)
+class Efl.Loop_Consumer (Efl.Object)
 {
-   [[An Efl.Loop.Consumer is a class which requires one of the parents to provide
+   [[An Efl.Loop_Consumer is a class which requires one of the parents to provide
      an Efl.Loop interface when performing provider_find. It will enforce this by
      only allowing parents which provide such an interface or NULL.]]
    eo_prefix: efl_loop;
diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo
index 18847eae07..45512b3b15 100644
--- a/src/lib/ecore/efl_loop_fd.eo
+++ b/src/lib/ecore/efl_loop_fd.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Loop.Fd (Efl.Loop.Consumer)
+class Efl.Loop_Fd (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 597f939b61..7912a81f21 100644
--- a/src/lib/ecore/efl_loop_handler.eo
+++ b/src/lib/ecore/efl_loop_handler.eo
@@ -9,7 +9,7 @@ enum Efl.Loop.Handler.Flags {
    error = 4, [[ Error channel input is desired ]]
 }
 
-class Efl.Loop.Handler (Efl.Object)
+class Efl.Loop_Handler (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 db873cc46d..57a81c522b 100644
--- a/src/lib/ecore/efl_loop_message.eo
+++ b/src/lib/ecore/efl_loop_message.eo
@@ -1,14 +1,14 @@
 import efl_types;
 import eina_types;
 
-class Efl.Loop.Message (Efl.Object)
+class Efl.Loop_Message (Efl.Object)
 {
    [[Base message payload object class. Inherit this and extend for
      specific message types.]]
    methods {
    }
    events {
-      message: Efl.Loop.Message; [[The message payload data]]
+      message: Efl.Loop_Message; [[The message payload data]]
    }
    implements {
       Efl.Object.constructor;
diff --git a/src/lib/ecore/efl_loop_message_future.eo b/src/lib/ecore/efl_loop_message_future.eo
index 8cdc928ab2..ec90dcf5ac 100644
--- a/src/lib/ecore/efl_loop_message_future.eo
+++ b/src/lib/ecore/efl_loop_message_future.eo
@@ -1,7 +1,7 @@
 import efl_types;
 import eina_types;
 
-class Efl.Loop.Message.Future (Efl.Loop.Message)
+class Efl.Loop_Message_Future (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 e53c054665..cc0f5a8138 100644
--- a/src/lib/ecore/efl_loop_message_future_handler.eo
+++ b/src/lib/ecore/efl_loop_message_future_handler.eo
@@ -1,21 +1,21 @@
 import efl_types;
 import eina_types;
 
-class Efl.Loop.Message.Future.Handler (Efl.Loop.Message.Handler)
+class Efl.Loop_Message_Future_Handler (Efl.Loop_Message_Handler)
 {
    [[ Internal use for future on an efl loop - replacing legacy ecore events ]]
    methods {
       message_type_add {
          [[ ]]
-         return: Efl.Loop.Message.Future; [[ ]]
+         return: Efl.Loop_Message_Future; [[ ]]
       }
    }
    events {
-      message,future: Efl.Loop.Message.Future; [[ ]]
+      message,future: Efl.Loop_Message_Future; [[ ]]
    }
    implements {
       Efl.Object.constructor;
       Efl.Object.destructor;
-      Efl.Loop.Message.Handler.message_call; [[ ]]
+      Efl.Loop_Message_Handler.message_call; [[ ]]
    }
 }
diff --git a/src/lib/ecore/efl_loop_message_handler.eo b/src/lib/ecore/efl_loop_message_handler.eo
index f0be9c4484..9d955195d5 100644
--- a/src/lib/ecore/efl_loop_message_handler.eo
+++ b/src/lib/ecore/efl_loop_message_handler.eo
@@ -1,7 +1,7 @@
 import efl_types;
 import eina_types;
 
-class Efl.Loop.Message.Handler (Efl.Object)
+class Efl.Loop_Message_Handler (Efl.Object)
 {
    [[Message handlers represent a single message type on the Efl.Loop
      parent object. These message handlers can be used to listen for
@@ -12,20 +12,20 @@ class Efl.Loop.Message.Handler (Efl.Object)
       message_add {
          [[Creates a new message object of the correct type for this
            message type.]]
-         return: Efl.Loop.Message; [[The new message payload object.]]
+         return: Efl.Loop_Message; [[The new message payload object.]]
       }
       message_send {
          [[Place the message on the queue to be called later when
            message_process() is called on the loop object.]]
          params {
-            @in message: Efl.Loop.Message; [[The message to place on the queue.]]
+            @in message: Efl.Loop_Message; [[The message to place on the queue.]]
          }
       }
       message_call {
          [[Overide me (implement) then call super after calling the
            right callback type if you specialize the message type.]]
          params {
-            @in message: Efl.Loop.Message; [[ Generic message event type ]]
+            @in message: Efl.Loop_Message; [[ Generic message event type ]]
          }
       }
       message_clear {
@@ -36,7 +36,7 @@ class Efl.Loop.Message.Handler (Efl.Object)
       }
    }
    events {
-      message: Efl.Loop.Message; [[The message payload data]]
+      message: Efl.Loop_Message; [[The message payload data]]
    }
    implements {
       Efl.Object.constructor;
diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo
index 1b74f10d36..fcea276a11 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 (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_promise.eo b/src/lib/ecore/efl_promise.eo
index 910bb45dd2..d3e2a020e2 100644
--- a/src/lib/ecore/efl_promise.eo
+++ b/src/lib/ecore/efl_promise.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-class Efl.Promise (Efl.Loop.Consumer)
+class Efl.Promise (Efl.Loop_Consumer)
 {
    [[Efl promise class]]
    methods {
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 b30328e5f2..dc262099bd 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 (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 aec72e52b4..d9ce75d4b1 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 (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 020395d53a..68c9446ab0 100644
--- a/src/lib/ecore_con/efl_net_control_technology.eo
+++ b/src/lib/ecore_con/efl_net_control_technology.eo
@@ -17,7 +17,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 (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 db63927a12..ab6ad36620 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 (Efl.Loop_Consumer, 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_websocket.eo b/src/lib/ecore_con/efl_net_dialer_websocket.eo
index f87bed8edc..cd2f453acc 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 (Efl.Loop_Consumer, 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_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo
index db558ec6d7..f31b5d99d6 100644
--- a/src/lib/ecore_con/efl_net_server_fd.eo
+++ b/src/lib/ecore_con/efl_net_server_fd.eo
@@ -1,4 +1,4 @@
-class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) {
+class Efl.Net.Server.Fd (Efl.Loop_Fd, Efl.Net.Server) {
     [[A generic server based on file descriptors.
 
       @since 1.19
@@ -58,7 +58,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) {
               It will be one of AF_INET (IPv4), AF_INET6 (IPv6),
               AF_UNIX...
 
-              It must be set before the @Efl.Loop.Fd.fd.set is called
+              It must be set before the @Efl.Loop_Fd.fd.set is called
               with a valid file descriptor.
             ]]
             get { }
@@ -115,7 +115,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) {
               else, such as in SOCK_DGRAM (UDP) there is no accept(),
               only recvfrom().
 
-              It is called straight from @Efl.Loop.Fd "read" event
+              It is called straight from @Efl.Loop_Fd "read" event
               handler and is provided as a method to allow easy
               extending of the class for various purposes.
             ]]
@@ -155,7 +155,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) {
         Efl.Object.finalize;
         Efl.Object.constructor;
         Efl.Object.destructor;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Net.Server.address { get; set; }
         Efl.Net.Server.clients_count { get; set; }
         Efl.Net.Server.clients_limit { get; set; }
diff --git a/src/lib/ecore_con/efl_net_server_simple.eo b/src/lib/ecore_con/efl_net_server_simple.eo
index 0b76579348..6ee1f5ef23 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 (Efl.Loop_Consumer, 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_windows.eo b/src/lib/ecore_con/efl_net_server_windows.eo
index 88d034b6cd..17bb177720 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 (Efl.Loop_Consumer, 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 095e7d19c9..96d4aa4cca 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 (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 f3f9089470..640ac34eba 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 (Efl.Loop_Fd, 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
@@ -18,7 +18,7 @@ class Efl.Net.Socket.Fd (Efl.Loop.Fd, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io
               It will be one of AF_INET (IPv4), AF_INET6 (IPv6),
               AF_UNIX...
 
-              It must be set before the @Efl.Loop.Fd.fd.set is called
+              It must be set before the @Efl.Loop_Fd.fd.set is called
               with a valid file descriptor.
             ]]
             get { }
@@ -33,7 +33,7 @@ class Efl.Net.Socket.Fd (Efl.Loop.Fd, Efl.Io.Reader_Fd, Efl.Io.Writer_Fd, Efl.Io
         Efl.Object.finalize;
         Efl.Object.constructor;
         Efl.Object.destructor;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Io.Closer.close;
         Efl.Io.Closer.closed { get; }
         Efl.Io.Reader.read;
diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo
index e493670773..b59f8787db 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 (Efl.Loop_Consumer, 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 7509f7b69a..65c5f37173 100644
--- a/src/lib/ecore_con/efl_net_socket_tcp.eo
+++ b/src/lib/ecore_con/efl_net_socket_tcp.eo
@@ -43,6 +43,6 @@ class Efl.Net.Socket.Tcp (Efl.Net.Socket.Fd) {
     }
 
     implements {
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
     }
 }
diff --git a/src/lib/ecore_con/efl_net_socket_udp.eo b/src/lib/ecore_con/efl_net_socket_udp.eo
index f8d66953f1..65e65bd57d 100644
--- a/src/lib/ecore_con/efl_net_socket_udp.eo
+++ b/src/lib/ecore_con/efl_net_socket_udp.eo
@@ -176,7 +176,7 @@ class Efl.Net.Socket.Udp (Efl.Net.Socket.Fd) {
     implements {
         Efl.Object.constructor;
         Efl.Object.destructor;
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
         Efl.Io.Reader.read;
         Efl.Io.Writer.write;
     }
diff --git a/src/lib/ecore_con/efl_net_socket_unix.eo b/src/lib/ecore_con/efl_net_socket_unix.eo
index bd9ca70e20..6173f03f9b 100644
--- a/src/lib/ecore_con/efl_net_socket_unix.eo
+++ b/src/lib/ecore_con/efl_net_socket_unix.eo
@@ -8,6 +8,6 @@ class Efl.Net.Socket.Unix (Efl.Net.Socket.Fd) {
     ]]
 
     implements {
-        Efl.Loop.Fd.fd { set; }
+        Efl.Loop_Fd.fd { set; }
     }
 }
diff --git a/src/lib/ecore_con/efl_net_socket_windows.eo b/src/lib/ecore_con/efl_net_socket_windows.eo
index 6e4d2c4382..305fb667b7 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 (Efl.Loop_Consumer, Efl.Net.Socket) {
     [[A base Windows NamedPipe socket.
 
       This is the common class and takes an existing file HANDLE,
diff --git a/src/lib/eio/efl_io_manager.eo b/src/lib/eio/efl_io_manager.eo
index d81edc91df..96058e1f07 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 (Efl.Loop_Consumer)
 {
   [[Class representing an asynchronous file operation.]]
 
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index 46644ff49b..81d5890578 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -3,7 +3,7 @@ import efl_canvas_animation_types;
 
 abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.Stack, Efl.Animator,
                             Efl.Input.Interface, Efl.Gfx.Size_Hint,
-                            Efl.Gfx.Map, Efl.Loop.Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
+                            Efl.Gfx.Map, Efl.Loop_Consumer, Efl.Ui.Base, Efl.Canvas.Pointer)
 {
    [[Efl canvas object abstract class]]
    legacy_prefix: evas_object;
@@ -619,7 +619,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
       Efl.Gfx.Size_Hint.hint_weight { get; set; }
       Efl.Gfx.Entity.scale { set; get; }
       Efl.Input.Interface.seat_event_filter { get; set; }
-      Efl.Loop.Consumer.loop { get; }
+      Efl.Loop_Consumer.loop { get; }
       Efl.Canvas.Pointer.pointer_inside { get; }
    }
    events {
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index d11285a611..09c2c2ed63 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.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interface,
-                   Efl.Loop.Consumer, Efl.Canvas.Pointer)
+                   Efl.Loop_Consumer, Efl.Canvas.Pointer)
 {
    [[Evas canvas class]]
    legacy_prefix: evas;
@@ -987,7 +987,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas.Scene, Efl.Animator, Efl.Input.Interfa
       Efl.Object.event_thaw;
       Efl.Object.event_freeze;
       Efl.Object.provider_find;
-      Efl.Loop.Consumer.loop { get; }
+      Efl.Loop_Consumer.loop { get; }
       //Efl.Canvas.seats;
       Efl.Canvas.Pointer.pointer_inside { get; }
       Efl.Canvas.Scene.device { get; }