diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index b2d28d1686..5eb8b2deac 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -376,7 +376,7 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object)
           [[Emit event]]
          params {
             @in accessible: Efl.Access.Object; [[Accessibility object.]]
-            @cref event: Efl.Event.Description; [[Accessibility event type.]]
+            @cref event: Efl.Event_Description; [[Accessibility event type.]]
             @in event_info: void_ptr; [[Accessibility event details.]]
          }
       }
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index ba68b77734..a9fd471c47 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -1,6 +1,6 @@
 import eina_types;
 
-struct Efl.Event.Description {
+struct Efl.Event_Description {
     [[This struct holds the description of a specific event.]]
     name: string; [[name of the event.]]
     unfreezable: bool; [[$true if the event cannot be frozen.]]
@@ -230,14 +230,14 @@ abstract Efl.Object ()
       event_callback_forwarder_add {
          [[Add an event callback forwarder for an event and an object.]]
          params {
-            @cref desc: Efl.Event.Description; [[The description of the event to listen to]]
+            @cref desc: Efl.Event_Description; [[The description of the event to listen to]]
             @in new_obj: Efl.Object; [[The object to emit events from]]
          }
       }
       event_callback_forwarder_del {
          [[Remove an event callback forwarder for an event and an object.]]
          params {
-            @cref desc: Efl.Event.Description; [[The description of the event to listen to]]
+            @cref desc: Efl.Event_Description; [[The description of the event to listen to]]
             @in new_obj: Efl.Object; [[The object to emit events from]]
          }
       }
@@ -318,6 +318,6 @@ struct Efl.Event {
       This is the full event information passed to callbacks in C.
     ]]
     object: Efl.Object; [[The object the callback was called on.]]
-    desc: const(ptr(Efl.Event.Description)); [[The event description.]]
+    desc: const(ptr(Efl.Event_Description)); [[The event description.]]
     info: void_ptr; [[Extra event information passed by the event caller]]
 }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index e44cb53dee..dabfe74dbc 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -581,7 +581,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx.Entity, Efl.Gfx.Color, Efl.Gfx.S
          get { legacy: null; }
          set { legacy: null; }
          keys {
-            @cref desc: Efl.Event.Description;
+            @cref desc: Efl.Event_Description;
                [[The event description for which the given $animation is set.]]
          }
          values {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture.eo b/src/lib/evas/gesture/efl_canvas_gesture.eo
index fdad8d2335..d4abd7c671 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture.eo
@@ -10,7 +10,7 @@ abstract Efl.Canvas.Gesture(Efl.Object)
          get {
          }
          values {
-            @cref type: Efl.Event.Description; [[gesture type]]
+            @cref type: Efl.Event_Description; [[gesture type]]
          }
       }
       @property state {
diff --git a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
index 79fc3cc595..5084083a38 100644
--- a/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
+++ b/src/lib/evas/gesture/efl_canvas_gesture_manager.eo
@@ -8,7 +8,7 @@ class Efl.Canvas.Gesture_Manager (Efl.Object)
          params {
             @in recognizer: Efl.Canvas.Gesture_Recognizer; [[The gesture recognizer object]]
          }
-         return: ptr(const(Efl.Event.Description)); [[Returns the Efl.Event.Description type the recognizer supports]]
+         return: ptr(const(Efl.Event_Description)); [[Returns the Efl.Event_Description type the recognizer supports]]
       }
       recognizer_unregister {
          [[This function is called to unregister a Efl.Canvas.Gesture_Recognizer]]