diff --git a/src/lib/ecore/efl_io_closer_fd.eo b/src/lib/ecore/efl_io_closer_fd.eo
index 9a95c3a777..b0b63b364b 100644
--- a/src/lib/ecore/efl_io_closer_fd.eo
+++ b/src/lib/ecore/efl_io_closer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Closer.Fd (Efl.Io.Closer, Efl.Object) {
+mixin Efl.Io.Closer_Fd (Efl.Io.Closer, Efl.Object) {
     [[Close fd using close(2).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_file.eo b/src/lib/ecore/efl_io_file.eo
index f718e371d6..82b011c98b 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
diff --git a/src/lib/ecore/efl_io_positioner_fd.eo b/src/lib/ecore/efl_io_positioner_fd.eo
index f6da1895ad..83ccc4727f 100644
--- a/src/lib/ecore/efl_io_positioner_fd.eo
+++ b/src/lib/ecore/efl_io_positioner_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Positioner.Fd (Efl.Io.Positioner) {
+mixin Efl.Io.Positioner_Fd (Efl.Io.Positioner) {
     [[Positions fd using lseek(2).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_reader_fd.eo b/src/lib/ecore/efl_io_reader_fd.eo
index fe0a74c118..1e4d79f2da 100644
--- a/src/lib/ecore/efl_io_reader_fd.eo
+++ b/src/lib/ecore/efl_io_reader_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Reader.Fd (Efl.Io.Reader) {
+mixin Efl.Io.Reader_Fd (Efl.Io.Reader) {
     [[Reads fd using read(2).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_sizer_fd.eo b/src/lib/ecore/efl_io_sizer_fd.eo
index 243d332a19..09edd062c8 100644
--- a/src/lib/ecore/efl_io_sizer_fd.eo
+++ b/src/lib/ecore/efl_io_sizer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Sizer.Fd (Efl.Io.Sizer) {
+mixin Efl.Io.Sizer_Fd (Efl.Io.Sizer) {
     [[Resizes fd usign ftruncate(2).
 
       @since 1.19
diff --git a/src/lib/ecore/efl_io_stderr.eo b/src/lib/ecore/efl_io_stderr.eo
index cef416b26a..16518da124 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
diff --git a/src/lib/ecore/efl_io_stdin.eo b/src/lib/ecore/efl_io_stdin.eo
index 3a0788a07c..24d29afeac 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
diff --git a/src/lib/ecore/efl_io_stdout.eo b/src/lib/ecore/efl_io_stdout.eo
index 9dd98d7a6b..c5f390df10 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
diff --git a/src/lib/ecore/efl_io_writer_fd.eo b/src/lib/ecore/efl_io_writer_fd.eo
index 2e69d532a5..018f286980 100644
--- a/src/lib/ecore/efl_io_writer_fd.eo
+++ b/src/lib/ecore/efl_io_writer_fd.eo
@@ -1,4 +1,4 @@
-mixin Efl.Io.Writer.Fd (Efl.Io.Writer) {
+mixin Efl.Io.Writer_Fd (Efl.Io.Writer) {
     [[Writes fd using write(2).
 
       @since 1.19
diff --git a/src/lib/ecore_con/efl_net_socket_fd.eo b/src/lib/ecore_con/efl_net_socket_fd.eo
index 9149464a75..f3f9089470 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
diff --git a/src/lib/efl/interfaces/efl_io_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo
index b344d784de..e958ad95aa 100644
--- a/src/lib/efl/interfaces/efl_io_positioner.eo
+++ b/src/lib/efl/interfaces/efl_io_positioner.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-enum Efl.Io.Positioner.Whence {
+enum Efl.Io.Positioner_Whence {
     [[Seek position modes]]
     start, [[Seek from start of the stream/file]]
     current, [[Seek from current position]]
@@ -20,7 +20,7 @@ mixin Efl.Io.Positioner {
             [[Seek in data]]
             params {
                 @in offset: int64; [[Offset in byte relative to whence]]
-                @in whence: Efl.Io.Positioner.Whence; [[Whence]]
+                @in whence: Efl.Io.Positioner_Whence; [[Whence]]
             }
             return: Eina.Error; [[0 on succeed, a mapping of errno otherwise]]
         }