Replace C names by Eolian namespaced names in .eo files

Reviewers: tasn, felipealmeida, raster, cedric

Differential Revision: https://phab.enlightenment.org/D2750

47 files changed, 196 insertions, 196 deletions

diff --git a/src/lib/elm_app_server_view.eo b/src/lib/elm_app_server_view.eo
index 431b0cfb8..dc484721f 100644
--- a/src/lib/elm_app_server_view.eo
+++ b/src/lib/elm_app_server_view.eo
@@ -43,7 +43,7 @@ class Elm_App_Server_View (Eo.Base)
          set {
          }
          values {
-            win: Evas_Object *;
+            win: Evas.Object *;
          }
       }
       @property id {
diff --git a/src/lib/elm_bg.eo b/src/lib/elm_bg.eo
index aa9d9110b..8dc66b2dc 100644
--- a/src/lib/elm_bg.eo
+++ b/src/lib/elm_bg.eo
@@ -91,8 +91,8 @@ class Elm.Bg (Elm.Layout, Efl.File)
             @ingroup Bg */
          }
          values {
-            w: Evas_Coord; /*@ The new width of the image pixmap representation. */
-            h: Evas_Coord; /*@ The new height of the image pixmap representation. */
+            w: Evas.Coord; /*@ The new width of the image pixmap representation. */
+            h: Evas.Coord; /*@ The new height of the image pixmap representation. */
          }
       }
    }
diff --git a/src/lib/elm_box.eo b/src/lib/elm_box.eo
index f7fead6b0..661097091 100644
--- a/src/lib/elm_box.eo
+++ b/src/lib/elm_box.eo
@@ -98,8 +98,8 @@ class Elm.Box (Elm.Widget)
             @ingroup Box */
          }
          values {
-            horizontal: Evas_Coord; /*@ The horizontal space between elements */
-            vertical: Evas_Coord; /*@ The vertical space between elements */
+            horizontal: Evas.Coord; /*@ The horizontal space between elements */
+            vertical: Evas.Coord; /*@ The vertical space between elements */
          }
       }
       @property layout {
@@ -151,7 +151,7 @@ class Elm.Box (Elm.Widget)
             You must free this list with eina_list_free() once you are done with it.
 
             @ingroup Box */
-            return: free(own(list<Evas_Object*>*), eina_list_free) @warn_unused;
+            return: free(own(list<Evas.Object*>*), eina_list_free) @warn_unused;
          }
       }
       pack_end {
@@ -174,7 +174,7 @@ class Elm.Box (Elm.Widget)
          @ingroup Box */
 
          params {
-            @in subobj: Evas_Object *; /*@ The object to add to the box */
+            @in subobj: Evas.Object *; /*@ The object to add to the box */
          }
       }
       unpack_all {
@@ -206,7 +206,7 @@ class Elm.Box (Elm.Widget)
          @ingroup Box */
 
          params {
-            @in subobj: Evas_Object *; /*@ The object to unpack */
+            @in subobj: Evas.Object *; /*@ The object to unpack */
          }
       }
       pack_after {
@@ -228,8 +228,8 @@ class Elm.Box (Elm.Widget)
          @ingroup Box */
 
          params {
-            @in subobj: Evas_Object *; /*@ The object to add to the box */
-            @in after: Evas_Object *; /*@ The object after which to add it */
+            @in subobj: Evas.Object *; /*@ The object to add to the box */
+            @in after: Evas.Object *; /*@ The object after which to add it */
          }
       }
       pack_start {
@@ -252,7 +252,7 @@ class Elm.Box (Elm.Widget)
          @ingroup Box */
 
          params {
-            @in subobj: Evas_Object *; /*@ The object to add to the box */
+            @in subobj: Evas.Object *; /*@ The object to add to the box */
          }
       }
       recalculate {
@@ -287,8 +287,8 @@ class Elm.Box (Elm.Widget)
          @ingroup Box */
 
          params {
-            @in subobj: Evas_Object *; /*@ The object to add to the box */
-            @in before: Evas_Object *; /*@ The object before which to add it */
+            @in subobj: Evas.Object *; /*@ The object to add to the box */
+            @in before: Evas.Object *; /*@ The object before which to add it */
          }
       }
       clear {
diff --git a/src/lib/elm_container.eo b/src/lib/elm_container.eo
index dcc34ab19..b9aa60fcc 100644
--- a/src/lib/elm_container.eo
+++ b/src/lib/elm_container.eo
@@ -9,14 +9,14 @@ class Elm.Container (Elm.Widget)
             /*@ Get the list of swallow parts in the object. */
          }
          values {
-            ret: free(own(list<Evas_Object *> *), eina_list_free); /*@ list */
+            ret: free(own(list<Evas.Object *> *), eina_list_free); /*@ list */
          }
       }
       content_set {
          /*@ Swallow the given object into the given part of the container. */
          params {
             @in name: const(char)*; /*@ the part in which to swallow the object */
-            @in content: Evas_Object *; /*@ the object to swallow */
+            @in content: Evas.Object *; /*@ the object to swallow */
          }
          return: bool;
       }
@@ -25,14 +25,14 @@ class Elm.Container (Elm.Widget)
          params {
             @in name: const(char)* @nullable; /*@ the part in which the object is swallowed */
          }
-         return: Evas_Object *;
+         return: Evas.Object *;
       }
       content_unset {
          /*@ Unswallow the object in the given part of the container and return it. */
          params {
             @in name: const(char)* @nullable;
          }
-         return: Evas_Object *;
+         return: Evas.Object *;
       }
    }
    implements {
diff --git a/src/lib/elm_ctxpopup.eo b/src/lib/elm_ctxpopup.eo
index 8986f62c0..903f6b97f 100644
--- a/src/lib/elm_ctxpopup.eo
+++ b/src/lib/elm_ctxpopup.eo
@@ -80,7 +80,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
             @ingroup Ctxpopup */
          }
          values {
-            parent: Evas_Object *; /*@ The parent to use */
+            parent: Evas.Object *; /*@ The parent to use */
          }
       }
       @property direction_priority {
@@ -214,7 +214,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The Label of the new item */
-            @in icon: Evas_Object * @optional; /*@ Icon to be set on new item */
+            @in icon: Evas.Object * @optional; /*@ Icon to be set on new item */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called when item selected */
             @in data: const(void)* @optional; /*@ Data passed to @p func */
          }
@@ -236,7 +236,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The Label of the new item */
-            @in icon: Evas_Object * @optional; /*@ Icon to be set on new item */
+            @in icon: Evas.Object * @optional; /*@ Icon to be set on new item */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called when item selected */
             @in data: const(void)* @optional; /*@ Data passed to @p func */
          }
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 87bff471b..2a6fb126f 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -213,7 +213,7 @@ class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The label of the diskselector item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use at left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use at left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is selected. */
diff --git a/src/lib/elm_entry.eo b/src/lib/elm_entry.eo
index baf422c28..6da7b48da 100644
--- a/src/lib/elm_entry.eo
+++ b/src/lib/elm_entry.eo
@@ -392,7 +392,7 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             @ingroup Entry */
          }
          values {
-            parent: Evas_Object * @nullable; /*@ The object to use as parent for the hover */
+            parent: Evas.Object * @nullable; /*@ The object to use as parent for the hover */
          }
       }
       @property prediction_allow {
@@ -664,7 +664,7 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             @return The textblock object.
 
             @ingroup Entry */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property cursor_geometry {
@@ -682,10 +682,10 @@ class Elm.Entry (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interface,
             return: bool;
          }
          values {
-            x: Evas_Coord; /*@ returned geometry */
-            y: Evas_Coord; /*@ returned geometry */
-            w: Evas_Coord; /*@ returned geometry */
-            h: Evas_Coord; /*@ returned geometry */
+            x: Evas.Coord; /*@ returned geometry */
+            y: Evas.Coord; /*@ returned geometry */
+            w: Evas.Coord; /*@ returned geometry */
+            h: Evas.Coord; /*@ returned geometry */
          }
       }
       @property imf_context {
diff --git a/src/lib/elm_fileselector_button.eo b/src/lib/elm_fileselector_button.eo
index e1f7ede93..49ff20c98 100644
--- a/src/lib/elm_fileselector_button.eo
+++ b/src/lib/elm_fileselector_button.eo
@@ -60,8 +60,8 @@ class Elm.Fileselector_Button (Elm.Button, Elm_Interface_Fileselector)
             @ingroup File_Selector_Button */
          }
          values {
-            width: Evas_Coord; /*@ The window's width */
-            height: Evas_Coord; /*@ The window's height */
+            width: Evas.Coord; /*@ The window's width */
+            height: Evas.Coord; /*@ The window's height */
          }
       }
       @property window_title {
diff --git a/src/lib/elm_fileselector_entry.eo b/src/lib/elm_fileselector_entry.eo
index d84c36873..b6519299c 100644
--- a/src/lib/elm_fileselector_entry.eo
+++ b/src/lib/elm_fileselector_entry.eo
@@ -60,8 +60,8 @@ class Elm.Fileselector_Entry (Elm.Layout, Elm_Interface_Fileselector)
             @ingroup File_Selector_Entry */
          }
          values {
-            width: Evas_Coord; /*@ The window's width */
-            height: Evas_Coord; /*@ The window's height */
+            width: Evas.Coord; /*@ The window's width */
+            height: Evas.Coord; /*@ The window's height */
          }
       }
       @property window_title {
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index e343f94be..1eb7deee8 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -147,8 +147,8 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             @ingroup Gengrid */
          }
          values {
-            w: Evas_Coord; /*@ The group items' width. */
-            h: Evas_Coord; /*@ The group items' height. */
+            w: Evas.Coord; /*@ The group items' width. */
+            h: Evas.Coord; /*@ The group items' height. */
          }
       }
       @property select_mode {
@@ -260,8 +260,8 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             @ingroup Gengrid */
          }
          values {
-            w: Evas_Coord; /*@ The items' width. */
-            h: Evas_Coord; /*@ The items' height. */
+            w: Evas.Coord; /*@ The items' width. */
+            h: Evas.Coord; /*@ The items' height. */
          }
       }
       @property multi_select_mode {
@@ -339,8 +339,8 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
             /*@ Set a given gengrid widget's scrolling page size */
          }
          values {
-            h_pagesize: Evas_Coord;
-            v_pagesize: Evas_Coord;
+            h_pagesize: Evas.Coord;
+            v_pagesize: Evas.Coord;
          }
       }
       @property selected_item {
@@ -564,8 +564,8 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
          @ingroup Gengrid */
          return: Elm_Object_Item *;
          params {
-            @in x: Evas_Coord; /*@ The input x coordinate */
-            @in y: Evas_Coord; /*@ The input y coordinate */
+            @in x: Evas.Coord; /*@ The input x coordinate */
+            @in y: Evas.Coord; /*@ The input y coordinate */
             @out xposret: int; /*@ The position relative to the item returned here */
             @out yposret: int; /*@ The position relative to the item returned here */
          }
diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index 552b4d39b..c003f92a2 100644
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -571,8 +571,8 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
          @ingroup Genlist */
          return: Elm_Object_Item *;
          params {
-            @in x: Evas_Coord; /*@ The input x coordinate */
-            @in y: Evas_Coord; /*@ The input y coordinate */
+            @in x: Evas.Coord; /*@ The input x coordinate */
+            @in y: Evas.Coord; /*@ The input y coordinate */
             @out posret: int; /*@ The position relative to the item returned here */
          }
       }
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index e95869cc5..37866868f 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -386,7 +386,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
                  @ingroup Genlist
                  */
                 params {
-                     @out l: own(list<own(Evas_Object *)> *); /*@ The contents list to return */
+                     @out l: own(list<own(Evas.Object *)> *); /*@ The contents list to return */
                 }
            }
            update {
diff --git a/src/lib/elm_gesture_layer.eo b/src/lib/elm_gesture_layer.eo
index d6974c68d..fe9feeed2 100644
--- a/src/lib/elm_gesture_layer.eo
+++ b/src/lib/elm_gesture_layer.eo
@@ -49,7 +49,7 @@ class Elm.Gesture_Layer (Elm.Widget)
              */
          }
          values {
-            sz: Evas_Coord; /*@ Finger size */
+            sz: Evas.Coord; /*@ Finger size */
          }
       }
       @property hold_events {
@@ -132,7 +132,7 @@ class Elm.Gesture_Layer (Elm.Widget)
 
          return: bool;
          params {
-            @in target: Evas_Object *; /*@ Object to attach to @a obj (target) */
+            @in target: Evas.Object *; /*@ Object to attach to @a obj (target) */
          }
       }
       cb_del {
diff --git a/src/lib/elm_grid.eo b/src/lib/elm_grid.eo
index 14aaeacd5..adc04ebfe 100644
--- a/src/lib/elm_grid.eo
+++ b/src/lib/elm_grid.eo
@@ -17,8 +17,8 @@ class Elm.Grid (Elm.Widget)
             @ingroup Grid */
          }
          values {
-            w: Evas_Coord; /*@ The virtual width of the grid */
-            h: Evas_Coord; /*@ The virtual height of the grid */
+            w: Evas.Coord; /*@ The virtual width of the grid */
+            h: Evas.Coord; /*@ The virtual height of the grid */
          }
       }
       @property children {
@@ -32,7 +32,7 @@ class Elm.Grid (Elm.Widget)
             list, but these removals won't be reflected on it.
 
             @ingroup Grid */
-            return: free(own(list<Evas_Object *> *), eina_list_free) @warn_unused;
+            return: free(own(list<Evas.Object *> *), eina_list_free) @warn_unused;
          }
       }
       clear {
@@ -52,7 +52,7 @@ class Elm.Grid (Elm.Widget)
          @ingroup Grid */
 
          params {
-            @in subobj: Evas_Object *; /*@ The child to unpack */
+            @in subobj: Evas.Object *; /*@ The child to unpack */
          }
       }
       pack {
@@ -62,11 +62,11 @@ class Elm.Grid (Elm.Widget)
          @ingroup Grid */
 
          params {
-            @in subobj: Evas_Object *; /*@ The child to pack */
-            @in x: Evas_Coord; /*@ The virtual x coord at which to pack it */
-            @in y: Evas_Coord; /*@ The virtual y coord at which to pack it */
-            @in w: Evas_Coord; /*@ The virtual width at which to pack it */
-            @in h: Evas_Coord; /*@ The virtual height at which to pack it */
+            @in subobj: Evas.Object *; /*@ The child to pack */
+            @in x: Evas.Coord; /*@ The virtual x coord at which to pack it */
+            @in y: Evas.Coord; /*@ The virtual y coord at which to pack it */
+            @in w: Evas.Coord; /*@ The virtual width at which to pack it */
+            @in h: Evas.Coord; /*@ The virtual height at which to pack it */
          }
       }
    }
diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo
index bac57cf3d..0e8b210ab 100644
--- a/src/lib/elm_hover.eo
+++ b/src/lib/elm_hover.eo
@@ -22,7 +22,7 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface)
             @ingroup Hover */
          }
          values {
-            target: Evas_Object *; /*@ The object to center the hover onto. */
+            target: Evas.Object *; /*@ The object to center the hover onto. */
          }
       }
       best_content_location_get @const {
diff --git a/src/lib/elm_hoversel.eo b/src/lib/elm_hoversel.eo
index 2f3884d6d..e76de41d3 100644
--- a/src/lib/elm_hoversel.eo
+++ b/src/lib/elm_hoversel.eo
@@ -52,7 +52,7 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
             @ingroup Hoversel */
          }
          values {
-            parent: Evas_Object * @nullable; /*@ The parent to use */
+            parent: Evas.Object * @nullable; /*@ The parent to use */
          }
       }
       @property expanded {
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index ec330f93b..07c01a2a8 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -407,7 +407,7 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
             elementary.
 
             @ingroup Image */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property object_size {
diff --git a/src/lib/elm_interface_fileselector.eo b/src/lib/elm_interface_fileselector.eo
index 9e4319cd1..dc95e629b 100644
--- a/src/lib/elm_interface_fileselector.eo
+++ b/src/lib/elm_interface_fileselector.eo
@@ -34,8 +34,8 @@ interface Elm_Interface_Fileselector ()
             /*@ Get the size for the thumbnail of a given file selector widget */
          }
          values {
-            w: Evas_Coord;
-            h: Evas_Coord;
+            w: Evas.Coord;
+            h: Evas.Coord;
          }
       }
       @property hidden_visible {
diff --git a/src/lib/elm_interface_scrollable.eo b/src/lib/elm_interface_scrollable.eo
index 35d9631de..89cf09085 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -109,7 +109,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
          get {
          }
          values {
-            block: Elm_Scroller_Movement_Block; /*@ Which axis (or axes) to block */
+            block: Elm.Scroller.Movement_Block; /*@ Which axis (or axes) to block */
          }
       }
       @property momentum_animator_disabled {
@@ -162,10 +162,10 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
          get {
          }
          values {
-            x: Evas_Coord; /*@ X coordinate of the region */
-            y: Evas_Coord; /*@ Y coordinate of the region */
-            w: Evas_Coord; /*@ Width of the region */
-            h: Evas_Coord; /*@ Height of the region */
+            x: Evas.Coord; /*@ X coordinate of the region */
+            y: Evas.Coord; /*@ Y coordinate of the region */
+            w: Evas.Coord; /*@ Width of the region */
+            h: Evas.Coord; /*@ Height of the region */
          }
       }
       @property repeat_events {
@@ -201,8 +201,8 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
          get {
          }
          values {
-            x: Evas_Coord; /*@ The horizontal page relative size */
-            y: Evas_Coord; /*@ The vertical page relative size */
+            x: Evas.Coord; /*@ The horizontal page relative size */
+            y: Evas.Coord; /*@ The vertical page relative size */
          }
       }
       @property bounce_animator_disabled {
@@ -265,8 +265,8 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
          values {
             pagerel_h: double;
             pagerel_v: double;
-            pagesize_h: Evas_Coord;
-            pagesize_v: Evas_Coord;
+            pagesize_h: Evas.Coord;
+            pagesize_v: Evas.Coord;
          }
       }
       @property single_direction {
@@ -291,7 +291,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
          get {
          }
          values {
-            single_dir: Elm_Scroller_Single_Direction; /*@ The single direction scroll policy */
+            single_dir: Elm.Scroller.Single_Direction; /*@ The single direction scroll policy */
          }
       }
       @property step_size {
@@ -302,8 +302,8 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            x: Evas_Coord;
-            y: Evas_Coord;
+            x: Evas.Coord;
+            y: Evas.Coord;
          }
       }
       @property loop {
@@ -450,7 +450,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            pan: Evas_Object * @nullable;
+            pan: Evas.Object * @nullable;
          }
       }
       @property page_change_cb {
@@ -563,7 +563,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            content: Evas_Object * @nullable;
+            content: Evas.Object * @nullable;
          }
       }
       @property edge_left_cb {
@@ -643,8 +643,8 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            edje_object: Evas_Object *;
-            hit_rectangle: Evas_Object *;
+            edje_object: Evas.Object *;
+            hit_rectangle: Evas.Object *;
          }
       }
       @property last_page {
@@ -692,10 +692,10 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            x: Evas_Coord;
-            y: Evas_Coord;
-            w: Evas_Coord;
-            h: Evas_Coord;
+            x: Evas.Coord;
+            y: Evas.Coord;
+            w: Evas.Coord;
+            h: Evas.Coord;
          }
       }
       @property content_size {
@@ -708,24 +708,24 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
              */
          }
          values {
-            w: Evas_Coord; /*@ Width of the content object. */
-            h: Evas_Coord; /*@ Height of the content object. */
+            w: Evas.Coord; /*@ Width of the content object. */
+            h: Evas.Coord; /*@ Height of the content object. */
 
          }
       }
       content_pos_set {
          /*@ No description supplied by the EAPI. */
          params {
-            @in x: Evas_Coord;
-            @in y: Evas_Coord;
+            @in x: Evas.Coord;
+            @in y: Evas.Coord;
             @in sig: bool;
          }
       }
       content_pos_get {
          /*@ No description supplied by the EAPI. */
          params {
-            @out x: Evas_Coord;
-            @out y: Evas_Coord;
+            @out x: Evas.Coord;
+            @out y: Evas.Coord;
          }
       }
       page_show {
@@ -759,10 +759,10 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
           @ingroup Widget
           */
          params {
-            @in x: Evas_Coord; /*@ X coordinate of the region */
-            @in y: Evas_Coord; /*@ Y coordinate of the region */
-            @in w: Evas_Coord; /*@ Width of the region */
-            @in h: Evas_Coord; /*@ Height of the region */
+            @in x: Evas.Coord; /*@ X coordinate of the region */
+            @in y: Evas.Coord; /*@ Y coordinate of the region */
+            @in w: Evas.Coord; /*@ Width of the region */
+            @in h: Evas.Coord; /*@ Height of the region */
          }
       }
       page_bring_in {
@@ -790,10 +790,10 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface, Evas.Object_Smart)
           @ingroup Widget
           */
          params {
-            @in x: Evas_Coord; /*@ X coordinate of the region */
-            @in y: Evas_Coord; /*@ Y coordinate of the region */
-            @in w: Evas_Coord; /*@ Width of the region */
-            @in h: Evas_Coord; /*@ Height of the region */
+            @in x: Evas.Coord; /*@ X coordinate of the region */
+            @in y: Evas.Coord; /*@ Y coordinate of the region */
+            @in w: Evas.Coord; /*@ Width of the region */
+            @in h: Evas.Coord; /*@ Height of the region */
          }
       }
       content_min_limit {
diff --git a/src/lib/elm_label.eo b/src/lib/elm_label.eo
index d5d0e27f3..a06e0ffe1 100644
--- a/src/lib/elm_label.eo
+++ b/src/lib/elm_label.eo
@@ -24,7 +24,7 @@ class Elm.Label (Elm.Layout)
             @ingroup Label */
          }
          values {
-            w: Evas_Coord; /*@ The wrap width in pixels at a minimum where words need to wrap */
+            w: Evas.Coord; /*@ The wrap width in pixels at a minimum where words need to wrap */
          }
       }
       @property slide_speed {
diff --git a/src/lib/elm_layout.eo b/src/lib/elm_layout.eo
index 5119cd7de..1073b0154 100644
--- a/src/lib/elm_layout.eo
+++ b/src/lib/elm_layout.eo
@@ -99,7 +99,7 @@ class Elm.Layout (Elm.Container, Efl.File)
             @see elm_layout_data_get()
 
             @ingroup Layout */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       box_remove_all {
@@ -173,10 +173,10 @@ class Elm.Layout (Elm.Container, Efl.File)
 
          @ingroup Layout */
 
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in part: const(char)*; /*@ The table part name to remove child. */
-            @in child: Evas_Object *; /*@ The object to remove from table. */
+            @in child: Evas.Object *; /*@ The object to remove from table. */
          }
       }
       freeze {
@@ -233,10 +233,10 @@ class Elm.Layout (Elm.Container, Efl.File)
 
          @ingroup Layout */
 
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in part: const(char)*; /*@ The box part name to remove child. */
-            @in child: Evas_Object *; /*@ The object to remove from box. */
+            @in child: Evas.Object *; /*@ The object to remove from box. */
          }
       }
       sizing_restricted_eval {
@@ -379,8 +379,8 @@ class Elm.Layout (Elm.Container, Efl.File)
          return: bool;
          params {
             @in part: const(char)*; /*@ the box part to insert. */
-            @in child: own(Evas_Object *); /*@ the child object to insert into box. */
-            @in reference: const(Evas_Object)*; /*@ another reference object to insert before in box. */
+            @in child: own(Evas.Object *); /*@ the child object to insert into box. */
+            @in reference: const(Evas.Object)*; /*@ another reference object to insert before in box. */
          }
       }
       box_insert_at {
@@ -404,7 +404,7 @@ class Elm.Layout (Elm.Container, Efl.File)
          return: bool;
          params {
             @in part: const(char)*; /*@ the box part to insert. */
-            @in child: own(Evas_Object *); /*@ the child object to insert into box. */
+            @in child: own(Evas.Object *); /*@ the child object to insert into box. */
             @in pos: uint; /*@ the numeric position >=0 to insert the child. */
          }
       }
@@ -464,7 +464,7 @@ class Elm.Layout (Elm.Container, Efl.File)
          return: bool;
          params {
             @in part: const(char)*; /*@ the box part to which the object will be appended. */
-            @in child: own(Evas_Object *); /*@ the child object to append to box. */
+            @in child: own(Evas.Object *); /*@ the child object to append to box. */
          }
       }
       signal_callback_del {
@@ -526,7 +526,7 @@ class Elm.Layout (Elm.Container, Efl.File)
          return: bool;
          params {
             @in part: const(char)*; /*@ the box part to prepend. */
-            @in child: own(Evas_Object *); /*@ the child object to prepend to box. */
+            @in child: own(Evas.Object *); /*@ the child object to prepend to box. */
          }
       }
       signal_emit {
@@ -575,7 +575,7 @@ class Elm.Layout (Elm.Container, Efl.File)
          return: bool;
          params {
             @in part: const(char)*; /*@ the box part to pack child. */
-            @in child: own(Evas_Object *); /*@ the child object to pack into table. */
+            @in child: own(Evas.Object *); /*@ the child object to pack into table. */
             @in col: ushort; /*@ the column to which the child should be added. (>= 0) */
             @in row: ushort; /*@ the row to which the child should be added. (>= 0) */
             @in colspan: ushort; /*@ how many columns should be used to store this object. (>=
diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 61ca68212..fd28c6857 100644
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -317,10 +317,10 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          params {
             @in before: Elm_Object_Item *; /*@ The list item to insert before. */
             @in label: const(char)*; /*@ The label of the list item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
-            @in end: Evas_Object * @optional; /*@ The icon object to use for the right side of the item. An
+            @in end: Evas.Object * @optional; /*@ The icon object to use for the right side of the item. An
             icon can be any Evas object. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with the item for related callbacks. */
@@ -382,10 +382,10 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          params {
             @in after: Elm_Object_Item *; /*@ The list item to insert after. */
             @in label: const(char)*; /*@ The label of the list item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
-            @in end: Evas_Object * @optional; /*@ The icon object to use for the right side of the item. An
+            @in end: Evas.Object * @optional; /*@ The icon object to use for the right side of the item. An
             icon can be any Evas object. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with the item for related callbacks. */
@@ -411,8 +411,8 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          @ingroup List */
          return: Elm_Object_Item *;
          params {
-            @in x: Evas_Coord; /*@ The input x coordinate */
-            @in y: Evas_Coord; /*@ The input y coordinate */
+            @in x: Evas.Coord; /*@ The input x coordinate */
+            @in y: Evas.Coord; /*@ The input y coordinate */
             @out posret: int; /*@ The position relative to the item returned here */
          }
       }
@@ -463,10 +463,10 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
-            @in end: Evas_Object * @optional; /*@ The icon object to use for the right side of the item. An
+            @in end: Evas.Object * @optional; /*@ The icon object to use for the right side of the item. An
             icon can be any Evas object. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with the item for related callbacks. */
@@ -509,10 +509,10 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
-            @in end: Evas_Object * @optional; /*@ The icon object to use for the right side of the item. An
+            @in end: Evas.Object * @optional; /*@ The icon object to use for the right side of the item. An
             icon can be any Evas object. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with the item for related callbacks. */
@@ -569,10 +569,10 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The label of the list item. */
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
-            @in end: Evas_Object * @optional; /*@ The icon object to use for the right side of the item. An
+            @in end: Evas.Object * @optional; /*@ The icon object to use for the right side of the item. An
             icon can be any Evas object. */
             @in func: Evas_Smart_Cb @optional; /*@ The function to call when the item is clicked. */
             @in data: const(void)* @optional; /*@ The data to associate with the item for related callbacks. */
diff --git a/src/lib/elm_list_item.eo b/src/lib/elm_list_item.eo
index d202c261d..0bb7e4c34 100644
--- a/src/lib/elm_list_item.eo
+++ b/src/lib/elm_list_item.eo
@@ -77,7 +77,7 @@ class Elm.List_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     obj: Evas_Object *; /*@ The base Edje object associated with @p it. */
+                     obj: Evas.Object *; /*@ The base Edje object associated with @p it. */
                 }
            }
            @property prev {
diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo
index 9b0068d0a..4773971cb 100644
--- a/src/lib/elm_map.eo
+++ b/src/lib/elm_map.eo
@@ -152,8 +152,8 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
          }
          values {
             degree: double; /*@ Angle from 0.0 to 360.0 to rotate around Z axis. */
-            cx: Evas_Coord; /*@ Rotation's center horizontal position. */
-            cy: Evas_Coord; /*@ Rotation's center vertical position. */
+            cx: Evas.Coord; /*@ Rotation's center horizontal position. */
+            cy: Evas.Coord; /*@ Rotation's center vertical position. */
          }
       }
       @property user_agent {
@@ -396,7 +396,7 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Map */
 
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in emap: void *; /*@ The emap route object. */
          }
@@ -415,8 +415,8 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
          params {
             @in lon: double; /*@ The longitude to convert. */
             @in lat: double; /*@ The latitude to convert. */
-            @out x: Evas_Coord; /*@ A pointer to horizontal coordinate. */
-            @out y: Evas_Coord; /*@ A pointer to vertical coordinate. */
+            @out x: Evas.Coord; /*@ A pointer to horizontal coordinate. */
+            @out y: Evas.Coord; /*@ A pointer to vertical coordinate. */
          }
       }
       overlay_circle_add {
@@ -670,7 +670,7 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
          @ingroup Map */
 
          params {
-            @in route: Evas_Object *; /*@ The track to remove. */
+            @in route: Evas.Object *; /*@ The track to remove. */
          }
       }
       overlay_route_add {
@@ -716,8 +716,8 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
 
          return: Elm_Map_Overlay *;
          params {
-            @in x: Evas_Coord; /*@ horizontal pixel coordinate. */
-            @in y: Evas_Coord; /*@ vertical pixel coordinate */
+            @in x: Evas.Coord; /*@ horizontal pixel coordinate. */
+            @in y: Evas.Coord; /*@ vertical pixel coordinate */
          }
       }
       overlay_add {
@@ -765,8 +765,8 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
 
          @ingroup Map */
          params {
-            @in x: Evas_Coord; /*@ horizontal coordinate of the point to convert. */
-            @in y: Evas_Coord; /*@ vertical coordinate of the point to convert. */
+            @in x: Evas.Coord; /*@ horizontal coordinate of the point to convert. */
+            @in y: Evas.Coord; /*@ vertical coordinate of the point to convert. */
             @out lon: double; /*@ A pointer to the longitude. */
             @out lat: double; /*@ A pointer to the latitude. */
          }
diff --git a/src/lib/elm_menu.eo b/src/lib/elm_menu.eo
index bbcaaf7e8..82df81b80 100644
--- a/src/lib/elm_menu.eo
+++ b/src/lib/elm_menu.eo
@@ -60,8 +60,8 @@ class Elm.Menu (Elm.Widget, Evas.Clickable_Interface)
          @ingroup Menu */
 
          params {
-            @in x: Evas_Coord; /*@ The new position. */
-            @in y: Evas_Coord; /*@ The new position. */
+            @in x: Evas.Coord; /*@ The new position. */
+            @in y: Evas.Coord; /*@ The new position. */
          }
       }
       item_add {
diff --git a/src/lib/elm_menu_item.eo b/src/lib/elm_menu_item.eo
index 29acebe1e..bee610a39 100644
--- a/src/lib/elm_menu_item.eo
+++ b/src/lib/elm_menu_item.eo
@@ -115,7 +115,7 @@ class Elm.Menu_Item(Elm.Widget_Item)
 
              @ingroup Menu
              */
-             return: Evas_Object*; /*@ The base Edje object containing the swallowed content associated with@p it. */
+             return: Evas.Object*; /*@ The base Edje object containing the swallowed content associated with@p it. */
         }
    }
    implements {
diff --git a/src/lib/elm_multibuttonentry.eo b/src/lib/elm_multibuttonentry.eo
index b0130bb6d..8f4dc7ca3 100644
--- a/src/lib/elm_multibuttonentry.eo
+++ b/src/lib/elm_multibuttonentry.eo
@@ -110,7 +110,7 @@ class Elm.Multibuttonentry (Elm.Layout)
             @return The entry object, or NULL if none
 
             @ingroup Multibuttonentry */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property selected_item {
diff --git a/src/lib/elm_naviframe.eo b/src/lib/elm_naviframe.eo
index f9b5bca0c..59af326ef 100644
--- a/src/lib/elm_naviframe.eo
+++ b/src/lib/elm_naviframe.eo
@@ -137,7 +137,7 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
 
          @ingroup Naviframe */
 
-         return: Evas_Object *;
+         return: Evas.Object *;
       }
       item_insert_before {
          /*@
@@ -162,13 +162,13 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
             @in before: Elm_Object_Item *; /*@ The naviframe item to insert before. */
             @in title_label: const(char)* @optional; /*@ The label in the title area. The name of the title
             label part is "elm.text.title" */
-            @in prev_btn: Evas_Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
+            @in prev_btn: Evas.Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
             then naviframe will create a back button automatically. The name of
             the prev_btn part is "elm.swallow.prev_btn" */
-            @in next_btn: Evas_Object * @nullable; /*@ The button to go to the next item. Or It could be just an
+            @in next_btn: Evas.Object * @nullable; /*@ The button to go to the next item. Or It could be just an
             extra function button. The name of the next_btn part is
             "elm.swallow.next_btn" */
-            @in content: Evas_Object *; /*@ The main content object. The name of content part is
+            @in content: Evas.Object *; /*@ The main content object. The name of content part is
             "elm.swallow.content" */
             @in item_style: const(char)* @nullable; /*@ The current item style name. @c NULL would be default. */
          }
@@ -195,13 +195,13 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          params {
             @in title_label: const(char)* @optional; /*@ The label in the title area. The name of the title
             label part is "elm.text.title" */
-            @in prev_btn: Evas_Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
+            @in prev_btn: Evas.Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
             then naviframe will create a back button automatically. The name of
             the prev_btn part is "elm.swallow.prev_btn" */
-            @in next_btn: Evas_Object * @nullable; /*@ The button to go to the next item. Or It could be just an
+            @in next_btn: Evas.Object * @nullable; /*@ The button to go to the next item. Or It could be just an
             extra function button. The name of the next_btn part is
             "elm.swallow.next_btn" */
-            @in content: Evas_Object *; /*@ The main content object. The name of content part is
+            @in content: Evas.Object *; /*@ The main content object. The name of content part is
             "elm.swallow.content" */
             @in item_style: const(char)* @nullable; /*@ The current item style name. @c NULL would be default. */
          }
@@ -213,7 +213,7 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          @see elm_naviframe_item_promote */
 
          params {
-            @in content: Evas_Object *;
+            @in content: Evas.Object *;
          }
       }
       item_insert_after {
@@ -239,13 +239,13 @@ class Elm.Naviframe (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
             @in after: Elm_Object_Item *; /*@ The naviframe item to insert after. */
             @in title_label: const(char)* @optional; /*@ The label in the title area. The name of the title
             label part is "elm.text.title" */
-            @in prev_btn: Evas_Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
+            @in prev_btn: Evas.Object * @nullable; /*@ The button to go to the previous item. If it is NULL,
             then naviframe will create a back button automatically. The name of
             the prev_btn part is "elm.swallow.prev_btn" */
-            @in next_btn: Evas_Object * @nullable; /*@ The button to go to the next item. Or It could be just an
+            @in next_btn: Evas.Object * @nullable; /*@ The button to go to the next item. Or It could be just an
             extra function button. The name of the next_btn part is
             "elm.swallow.next_btn" */
-            @in content: Evas_Object *; /*@ The main content object. The name of content part is
+            @in content: Evas.Object *; /*@ The main content object. The name of content part is
             "elm.swallow.content" */
             @in item_style: const(char)* @nullable; /*@ The current item style name. @c NULL would be default. */
          }
diff --git a/src/lib/elm_pan.eo b/src/lib/elm_pan.eo
index 258af9e72..8b260db8c 100644
--- a/src/lib/elm_pan.eo
+++ b/src/lib/elm_pan.eo
@@ -23,8 +23,8 @@ class Elm_Pan (Evas.Smart_Clipped)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            x: Evas_Coord;
-            y: Evas_Coord;
+            x: Evas.Coord;
+            y: Evas.Coord;
          }
       }
       @property content_size {
@@ -32,8 +32,8 @@ class Elm_Pan (Evas.Smart_Clipped)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            w: Evas_Coord;
-            h: Evas_Coord;
+            w: Evas.Coord;
+            h: Evas.Coord;
          }
       }
       @property pos_min {
@@ -41,8 +41,8 @@ class Elm_Pan (Evas.Smart_Clipped)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            x: Evas_Coord;
-            y: Evas_Coord;
+            x: Evas.Coord;
+            y: Evas.Coord;
          }
       }
       @property pos_max {
@@ -50,8 +50,8 @@ class Elm_Pan (Evas.Smart_Clipped)
             /*@ No description supplied by the EAPI. */
          }
          values {
-            x: Evas_Coord;
-            y: Evas_Coord;
+            x: Evas.Coord;
+            y: Evas.Coord;
          }
       }
    }
diff --git a/src/lib/elm_panes.eo b/src/lib/elm_panes.eo
index 53331b1a5..ffab1ef6a 100644
--- a/src/lib/elm_panes.eo
+++ b/src/lib/elm_panes.eo
@@ -231,7 +231,7 @@ class Elm.Panes (Elm.Layout)
             @ingroup Panes */
          }
          values {
-            size: Evas_Coord; /*@ value representing minimum size of left side
+            size: Evas.Coord; /*@ value representing minimum size of left side
                                in pixels. */
          }
       }
@@ -261,7 +261,7 @@ class Elm.Panes (Elm.Layout)
             @ingroup Panes */
          }
          values {
-            size: Evas_Coord; /*@ value representing minimum size of right side
+            size: Evas.Coord; /*@ value representing minimum size of right side
                                in pixels. */
          }
       }
diff --git a/src/lib/elm_photocam.eo b/src/lib/elm_photocam.eo
index 4ca3a642a..2303bf052 100644
--- a/src/lib/elm_photocam.eo
+++ b/src/lib/elm_photocam.eo
@@ -155,7 +155,7 @@ class Elm.Photocam (Elm.Widget, Elm_Interface_Scrollable,
             deleted at any time as well.
 
             @ingroup Photocam */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property image_size {
diff --git a/src/lib/elm_plug.eo b/src/lib/elm_plug.eo
index 95ad30430..9b41e6803 100644
--- a/src/lib/elm_plug.eo
+++ b/src/lib/elm_plug.eo
@@ -18,7 +18,7 @@ class Elm.Plug (Elm.Widget)
             elementary.
 
             @ingroup Plug */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       connect {
diff --git a/src/lib/elm_popup.eo b/src/lib/elm_popup.eo
index 4ab009aa5..341537ce6 100644
--- a/src/lib/elm_popup.eo
+++ b/src/lib/elm_popup.eo
@@ -148,7 +148,7 @@ class Elm.Popup (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          return: Elm_Object_Item *;
          params {
             @in label: const(char)*; /*@ The Label of the new item */
-            @in icon: Evas_Object * @optional; /*@ Icon to be set on new item */
+            @in icon: Evas.Object * @optional; /*@ Icon to be set on new item */
             @in func: Evas_Smart_Cb @optional; /*@ Convenience function called when item selected */
             @in data: const(void)* @optional; /*@ Data passed to @p func above */
          }
diff --git a/src/lib/elm_prefs.eo b/src/lib/elm_prefs.eo
index 0cb5ab21c..2551d2c79 100644
--- a/src/lib/elm_prefs.eo
+++ b/src/lib/elm_prefs.eo
@@ -162,7 +162,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
 
          @since 1.8 */
 
-         return: const(Evas_Object)*;
+         return: const(Evas.Object)*;
          params {
             @in name: const(char)*; /*@ The name of the item (as declared in the prefs
             collection) to get object from */
@@ -215,7 +215,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
          params {
             @in name: const(char)*; /*@ the name of the SWALLOW item (as declared in the prefs
             collection) */
-            @in child: Evas_Object *; /*@ The object to occupy the item */
+            @in child: Evas.Object *; /*@ The object to occupy the item */
          }
       }
       item_editable_set {
@@ -265,7 +265,7 @@ class Elm.Prefs (Elm.Widget, Efl.File)
 
          @since 1.8 */
 
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in name: const(char)*; /*@ the name of the SWALLOW item (as declared in the prefs
             collection) */
diff --git a/src/lib/elm_progressbar.eo b/src/lib/elm_progressbar.eo
index a35b64c04..1364f5691 100644
--- a/src/lib/elm_progressbar.eo
+++ b/src/lib/elm_progressbar.eo
@@ -36,7 +36,7 @@ class Elm.Progressbar (Elm.Layout)
             @ingroup Progressbar */
          }
          values {
-            size: Evas_Coord; /*@ The length of the progress bar's bar region */
+            size: Evas.Coord; /*@ The length of the progress bar's bar region */
          }
       }
       @property pulse {
diff --git a/src/lib/elm_radio.eo b/src/lib/elm_radio.eo
index 854ea98df..786c17add 100644
--- a/src/lib/elm_radio.eo
+++ b/src/lib/elm_radio.eo
@@ -75,7 +75,7 @@ class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
             @return The selected radio object
 
             @ingroup Radio */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       group_add {
@@ -90,7 +90,7 @@ class Elm.Radio (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
          @ingroup Radio */
 
          params {
-            @in group: Elm_Radio *; /*@ Any radio object whose group the @p obj is to join. */
+            @in group: Elm.Radio *; /*@ Any radio object whose group the @p obj is to join. */
          }
       }
    }
diff --git a/src/lib/elm_segment_control.eo b/src/lib/elm_segment_control.eo
index 466103ffe..1ac3908d1 100644
--- a/src/lib/elm_segment_control.eo
+++ b/src/lib/elm_segment_control.eo
@@ -80,7 +80,7 @@ class Elm.Segment_Control (Elm.Layout)
 
          return: Elm_Object_Item *;
          params {
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
             @in label: const(char)* @optional; /*@ The label of the item. */
@@ -156,7 +156,7 @@ class Elm.Segment_Control (Elm.Layout)
 
          return: Elm_Object_Item *;
          params {
-            @in icon: Evas_Object * @optional; /*@ The icon object to use for the left side of the item. An
+            @in icon: Evas.Object * @optional; /*@ The icon object to use for the left side of the item. An
             icon can be any Evas object, but usually it is an icon created
             with elm_icon_add(). */
             @in label: const(char)* @optional; /*@ The label of the item.
@@ -178,7 +178,7 @@ class Elm.Segment_Control (Elm.Layout)
          @see elm_object_item_part_content_set()
 
          @ingroup SegmentControl */
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in idx: int; /*@ The index of the segment item. */
          }
diff --git a/src/lib/elm_segment_control_item.eo b/src/lib/elm_segment_control_item.eo
index c3274cf64..392a0edcb 100644
--- a/src/lib/elm_segment_control_item.eo
+++ b/src/lib/elm_segment_control_item.eo
@@ -28,7 +28,7 @@ class Elm.Segment_Control_Item(Elm.Widget_Item)
 
               @ingroup SegmentControl
              */
-             return: Evas_Object*;
+             return: Evas.Object*;
         }
       selected_set {
              /*@
diff --git a/src/lib/elm_slider.eo b/src/lib/elm_slider.eo
index 602a77b68..18d55f3fa 100644
--- a/src/lib/elm_slider.eo
+++ b/src/lib/elm_slider.eo
@@ -297,7 +297,7 @@ class Elm.Slider (Elm.Layout, Elm_Interface_Atspi_Value,
             @ingroup Slider */
          }
          values {
-            size: Evas_Coord; /*@ The length of the slider's bar region. */
+            size: Evas.Coord; /*@ The length of the slider's bar region. */
          }
       }
       @property step {
diff --git a/src/lib/elm_slideshow_item.eo b/src/lib/elm_slideshow_item.eo
index 9aa6e8e3c..62b21cc26 100644
--- a/src/lib/elm_slideshow_item.eo
+++ b/src/lib/elm_slideshow_item.eo
@@ -31,7 +31,7 @@ class Elm.Slideshow_Item(Elm.Widget_Item)
 
               @ingroup Slideshow
               */
-             return: Evas_Object*;
+             return: Evas.Object*;
         }
    }
    implements {
diff --git a/src/lib/elm_table.eo b/src/lib/elm_table.eo
index 264b4f55f..347ee95e9 100644
--- a/src/lib/elm_table.eo
+++ b/src/lib/elm_table.eo
@@ -40,8 +40,8 @@ class Elm.Table (Elm.Widget)
             @ingroup Table */
          }
          values {
-            horizontal: Evas_Coord; /*@ set the horizontal padding. */
-            vertical: Evas_Coord; /*@ set the vertical padding. */
+            horizontal: Evas.Coord; /*@ set the horizontal padding. */
+            vertical: Evas.Coord; /*@ set the vertical padding. */
          }
       }
       @property align {
@@ -81,7 +81,7 @@ class Elm.Table (Elm.Widget)
          @brief Get child object of table at given coordinates.
 
          @return Child of object if find if not return NULL. */
-         return: Evas_Object *;
+         return: Evas.Object *;
          params {
             @in col: int; /*@ Column number of child object */
             @in row: int; /*@ Row number of child object */
@@ -100,7 +100,7 @@ class Elm.Table (Elm.Widget)
          @ingroup Table */
 
          params {
-            @in subobj: Evas_Object *; /*@ The subobject to be modified in the table */
+            @in subobj: Evas.Object *; /*@ The subobject to be modified in the table */
             @in column: int; /*@ Column number */
             @in row: int; /*@ Row number */
             @in colspan: int; /*@ colspan */
@@ -117,7 +117,7 @@ class Elm.Table (Elm.Widget)
          @ingroup Table */
 
          params {
-            @in subobj: Evas_Object *; /*@ The subobject to be modified in the table */
+            @in subobj: Evas.Object *; /*@ The subobject to be modified in the table */
             @out column: int; /*@ Column number */
             @out row: int; /*@ Row number */
             @out colspan: int; /*@ colspan */
@@ -132,7 +132,7 @@ class Elm.Table (Elm.Widget)
          @ingroup Table */
 
          params {
-            @in subobj: Evas_Object *; /*@ The subobject */
+            @in subobj: Evas.Object *; /*@ The subobject */
          }
       }
       pack {
@@ -152,7 +152,7 @@ class Elm.Table (Elm.Widget)
          @ingroup Table */
 
          params {
-            @in subobj: Evas_Object *; /*@ The subobject to be added to the table */
+            @in subobj: Evas.Object *; /*@ The subobject to be added to the table */
             @in column: int; /*@ Column number */
             @in row: int; /*@ Row number */
             @in colspan: int; /*@ colspan */
diff --git a/src/lib/elm_toolbar.eo b/src/lib/elm_toolbar.eo
index 3735f2edd..c3be0b48c 100644
--- a/src/lib/elm_toolbar.eo
+++ b/src/lib/elm_toolbar.eo
@@ -247,7 +247,7 @@ class Elm.Toolbar (Elm.Widget, Elm_Interface_Scrollable,
             @ingroup Toolbar */
          }
          values {
-            parent: Evas_Object *; /*@ The parent of the menu objects. */
+            parent: Evas.Object *; /*@ The parent of the menu objects. */
          }
       }
       @property standard_priority {
diff --git a/src/lib/elm_toolbar_item.eo b/src/lib/elm_toolbar_item.eo
index 2fb998bdc..24fa8a5ca 100644
--- a/src/lib/elm_toolbar_item.eo
+++ b/src/lib/elm_toolbar_item.eo
@@ -157,7 +157,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     obj: Evas_Object *; /*@ The base Edje object associated with @p it. */
+                     obj: Evas.Object *; /*@ The base Edje object associated with @p it. */
                 }
            }
            @property icon_object {
@@ -172,7 +172,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     obj: Evas_Object *; /*@ The icon object */
+                     obj: Evas.Object *; /*@ The icon object */
                 }
            }
            @property separator {
@@ -223,7 +223,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                       */
                 }
                 values {
-                     menu: Evas_Object *; /*@ Item's menu object or @c NULL on failure. */
+                     menu: Evas.Object *; /*@ Item's menu object or @c NULL on failure. */
                 }
            }
            @property state {
@@ -372,7 +372,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                  @ingroup Toolbar
                  */
                 params {
-                     @in scrollto: Elm_Toolbar_Item_Scrollto_Type; /*@ the position the item should appear at */
+                     @in scrollto: Elm.Toolbar_Item.Scrollto_Type; /*@ the position the item should appear at */
                 }
            }
            bring_in {
@@ -385,7 +385,7 @@ class Elm.Toolbar_Item(Elm.Widget_Item)
                  @ingroup Toolbar
                  */
                 params {
-                     @in scrollto: Elm_Toolbar_Item_Scrollto_Type; /*@ the position the item should appear at */
+                     @in scrollto: Elm.Toolbar_Item.Scrollto_Type; /*@ the position the item should appear at */
                 }
            }
            menu_set {
diff --git a/src/lib/elm_video.eo b/src/lib/elm_video.eo
index 89b51c838..f86e2f466 100644
--- a/src/lib/elm_video.eo
+++ b/src/lib/elm_video.eo
@@ -118,7 +118,7 @@ class Elm.Video (Elm.Layout, Efl.File, Elm_Interface_Atspi_Widget_Action)
             @return the underlying Emotion object.
 
             @ingroup Video */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property is_seekable {
diff --git a/src/lib/elm_web.eo b/src/lib/elm_web.eo
index 76808f4df..e0b8863ad 100644
--- a/src/lib/elm_web.eo
+++ b/src/lib/elm_web.eo
@@ -384,7 +384,7 @@ class Elm.Web (Elm.Widget)
             @see elm_web_add()
 
             @ingroup Web */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property back_possible {
diff --git a/src/lib/elm_widget_item.eo b/src/lib/elm_widget_item.eo
index 69451d4b2..816dd448a 100644
--- a/src/lib/elm_widget_item.eo
+++ b/src/lib/elm_widget_item.eo
@@ -195,7 +195,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                      part: const (char) * @nullable; /*@ The content part name  (NULL for the default content) */
                 }
                 values {
-                     content: Evas_Object *; /*@ The content of the object item */
+                     content: Evas.Object *; /*@ The content of the object item */
                 }
            }
            @property part_text {
@@ -325,7 +325,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @ingroup General
                  */
-                return: const(list<Evas_Object *>) *;
+                return: const(list<Evas.Object *>) *;
            }
            access_order_set {
                 /*@
@@ -335,7 +335,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                   @ingroup General
                  */
                 params {
-                     @in objs: own(list<Evas_Object *> *); /*@ Order of objects to pass highlight */
+                     @in objs: own(list<Evas.Object *> *); /*@ Order of objects to pass highlight */
                 }
            }
            widget_get @const {
@@ -346,7 +346,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                   @note Every elm_object_item supports this API
                   @ingroup General
                  */
-                  return: Evas_Object*; /*@ The widget object */
+                  return: Evas.Object*; /*@ The widget object */
            }
            del {
                 /*@
@@ -422,7 +422,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
                 params {
                      part: const (char) *; /*@ The content part name to unset (NULL for the default content) */
                 }
-                return: Evas_Object*;
+                return: Evas.Object*;
            }
            part_text_custom_update @protected {
                 /*@ Update additional text part content */
@@ -502,7 +502,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @ingroup General
                  */
-                return: Evas_Object*; /*@ Accessible object of the object item or NULL for any error */
+                return: Evas.Object*; /*@ Accessible object of the object item or NULL for any error */
            }
            domain_translatable_part_text_set {
                 /*@
@@ -602,7 +602,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @ingroup General
                  */
-                return: Evas_Object*; /*@ The track object */
+                return: Evas.Object*; /*@ The track object */
            }
            untrack {
                 /*@
@@ -695,7 +695,7 @@ class Elm.Widget_Item(Eo.Base, Elm_Interface_Atspi_Accessible,
 
                   @ingroup General
                  */
-                return: Evas_Object*; /*@ Accessible object of the object item or NULL for any error */
+                return: Evas.Object*; /*@ Accessible object of the object item or NULL for any error */
            }
            access_unregister {
                 /*@
diff --git a/src/lib/elm_win.eo b/src/lib/elm_win.eo
index 10b236bd5..6bfa43f58 100644
--- a/src/lib/elm_win.eo
+++ b/src/lib/elm_win.eo
@@ -690,7 +690,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
 
             @ingroup Win */
             values {
-               icon: Evas_Object* @nullable; /*@ The Evas image object to use for an icon */
+               icon: Evas.Object* @nullable; /*@ The Evas image object to use for an icon */
             }
          }
          get {
@@ -704,7 +704,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
 
             @ingroup Win */
             values {
-               icon: const(Evas_Object)* @nullable; /*@ The Evas image object to use for an icon */
+               icon: const(Evas.Object)* @nullable; /*@ The Evas image object to use for an icon */
             }
          }
       }
@@ -1239,7 +1239,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
             @return The Main Menu of the window (NULL if error).
 
             @ingroup Win */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property wl_window {
@@ -1295,7 +1295,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
             @return The inlined image object, or NULL if none exists
 
             @ingroup Win */
-            return: Evas_Object *;
+            return: Evas.Object *;
          }
       }
       @property name {
@@ -1505,7 +1505,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
          @ingroup Win */
 
          params {
-            @in subobj: Evas_Object *; /*@ The resize object to add */
+            @in subobj: Evas.Object *; /*@ The resize object to add */
          }
       }
       raise {
@@ -1546,7 +1546,7 @@ class Elm.Win (Elm.Widget, Elm_Interface_Atspi_Window,
          @ingroup Win */
 
          params {
-            @in subobj: Evas_Object *; /*@ The resize object to add */
+            @in subobj: Evas.Object *; /*@ The resize object to add */
          }
       }
       center {