diff --git a/src/lib/ecore_con/efl_net_ip_address.eo b/src/lib/ecore_con/efl_net_ip_address.eo
index e715a0c7bb..eebbb0ac5b 100644
--- a/src/lib/ecore_con/efl_net_ip_address.eo
+++ b/src/lib/ecore_con/efl_net_ip_address.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-struct Efl.Net.Ip_Address.Resolve_Results {
+struct Efl.Net.Ip_Address_Resolve_Results {
     [[The results of @Efl.Net.Ip_Address.resolve call.
 
       This structure is created by @Efl.Net.Ip_Address.resolve.
@@ -112,7 +112,7 @@ class Efl.Net.Ip_Address (Efl.Object) {
                 family: int @optional; [[Preferred family. AF_UNSPEC or 0 for both, otherwise one of AF_INET or AF_INET6]]
                 flags: int @optional; [[Flags to use with getaddrinfo(). If 0, default flags are used (AI_V4MAPPED | AI_ADDRCONFIG, if these exist in your system).]]
             }
-            return: future<const(Efl.Net.Ip_Address.Resolve_Results)>; [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]]
+            return: future<const(Efl.Net.Ip_Address_Resolve_Results)>; [[The resolve results. It contains a list of Efl.Net.Ip_Address, they will be automatically deleted unless you keep a reference to it.]]
         }
 
         @property string {
diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo
index 8bfd4497cd..87ca0d05fd 100644
--- a/src/lib/ecore_con/efl_net_session.eo
+++ b/src/lib/ecore_con/efl_net_session.eo
@@ -1,4 +1,4 @@
-enum Efl.Net.Session.State {
+enum Efl.Net.Session_State {
     [[Provides the session connectivity state.
 
       @since 1.19
@@ -9,7 +9,7 @@ enum Efl.Net.Session.State {
 }
 
 /* keep in sync with efl_net_control_technology.eo, comment what doesn't make sense */
-enum Efl.Net.Session.Technology {
+enum Efl.Net.Session_Technology {
     [[Bitwise-able technologies to allow for a network session.
 
       @since 1.9
@@ -24,7 +24,7 @@ enum Efl.Net.Session.Technology {
     vpn = (1 << 6), [[Type: Virtual Private Network]]
     gadget = (1 << 7), [[Type: USB gadget]]
 /*    p2p = (1 << 8), [[Type: Peer-2-Peer]]*/
-    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]]
+    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) {
@@ -37,9 +37,9 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
 
       Some platforms may not implement the backend for this class. In
       this cases the system will report always @.state "online"
-      (@Efl.Net.Session.State.online) and other properties will be
+      (@Efl.Net.Session_State.online) and other properties will be
       NULL, such as @.network_name, @.interface, @.ipv4 and @.ipv6; as well as
-      @.technology is set to @Efl.Net.Session.Technology.unknown. As such
+      @.technology is set to @Efl.Net.Session_Technology.unknown. As such
       if you need to detect for an actual backend, check if the
       state is online but those properties are NULL or technology is
       unknown.
@@ -70,7 +70,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
             ]]
             params {
                 online_required: bool; [[If $false, access points with local state are enough. If $true, the access point must be in online state, with a validated internet connection]]
-                technologies_allowed: Efl.Net.Session.Technology; [[Bitwise OR of technologies to allow]]
+                technologies_allowed: Efl.Net.Session_Technology; [[Bitwise OR of technologies to allow]]
             }
         }
 
@@ -102,7 +102,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
             ]]
             get { }
             values {
-                state: Efl.Net.Session.State; [[Network session state]]
+                state: Efl.Net.Session_State; [[Network session state]]
             }
         }
 
@@ -110,7 +110,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) {
             [[The access point technology that backs this session]]
             get { }
             values {
-                technology: Efl.Net.Session.Technology; [[Network session technology]]
+                technology: Efl.Net.Session_Technology; [[Network session technology]]
             }
         }