diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index bb70a8f377..99fb734f94 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -34,7 +34,7 @@ class Efl.Loop (Efl.Object)
          ]]
          get {}
          values {
-            version: ptr(const(Efl.Version)); [[Efl version]]
+            @cref version: Efl.Version; [[Efl version]]
          }
       }
       @property efl_version {
@@ -44,7 +44,7 @@ class Efl.Loop (Efl.Object)
          ]]
          get {}
          values {
-            version: ptr(const(Efl.Version)); [[Efl version]]
+            @cref version: Efl.Version; [[Efl version]]
          }
       }
       iterate {
diff --git a/src/lib/ecore/efl_model_container.eo b/src/lib/ecore/efl_model_container.eo
index 1b1a0f1ad4..7310380c3d 100644
--- a/src/lib/ecore/efl_model_container.eo
+++ b/src/lib/ecore/efl_model_container.eo
@@ -40,7 +40,7 @@ class Efl.Model.Container (Efl.Object, Efl.Model)
            Value type is required for compatibility with the @Efl.Model API.]]
          params {
             name: string; [[Property name]]
-            type: ptr(const(Eina.Value.Type)); [[Property type]]
+            @cref type: Eina.Value.Type; [[Property type]]
             values: iterator<const(void_ptr)> @owned; [[Values to be added]]
          }
          return: bool; [[$true on success, $false otherwise]]
diff --git a/src/lib/ecore_con/efl_net_control.eo b/src/lib/ecore_con/efl_net_control.eo
index d93f459e17..809c33e5f5 100644
--- a/src/lib/ecore_con/efl_net_control.eo
+++ b/src/lib/ecore_con/efl_net_control.eo
@@ -209,7 +209,7 @@ class Efl.Net.Control (Efl.Loop_User) {
             [[If event "agent_request_input" was emitted, this will reply with the requested data]]
             params {
                 name: string @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.name was present, this should contain the network name or the 'ssid' parameter should be used.]]
-                ssid: ptr(const(Eina.Slice)) @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.ssid was present, this should contain the network SSID or the 'name' parameter should be used.]]
+                @cref ssid: Eina.Slice @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.ssid was present, this should contain the network SSID or the 'name' parameter should be used.]]
                 username: string @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.username was present, this should contain the identity or username]]
                 passphrase: string @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.passphrase was present, this should contain the password or passphrase, more details on how it should be interpreted was given in Efl.Net.Control.Agent_Request_Input.passphrase_type.]]
                 wps: string @nullable; [[If @Efl.Net.Control.Agent_Request_Input.Field.wps was present, this should contain the WPS PIN or an empty string "" to use the WPS push button instead.]]
diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo
index 0c39a69107..451c77c6c6 100644
--- a/src/lib/ector/ector_renderer.eo
+++ b/src/lib/ector/ector_renderer.eo
@@ -34,7 +34,7 @@ abstract Ector.Renderer (Efl.Object)
 	 get {
 	 }
 	 values {
-	    m: ptr(const(Eina.Matrix3)); [[Transformation matrix]]
+	    @cref m: Eina.Matrix3; [[Transformation matrix]]
 	 }
       }
       @property origin {
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index a2124200f5..b1e1f062db 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -60,7 +60,7 @@ class Edje.Object (Efl.Canvas.Group, Efl.File, Efl.Container, Efl.Part,
 
               See also @.perspective.set()]]
             values {
-                ps: ptr(const(Edje.Perspective)); [[The perspective object that will be used.]]
+                @cref ps: Edje.Perspective; [[The perspective object that will be used.]]
             }
          }
       }
diff --git a/src/lib/efl/interfaces/efl_text_cursor.eo b/src/lib/efl/interfaces/efl_text_cursor.eo
index 2baff113bf..243a2f1045 100644
--- a/src/lib/efl/interfaces/efl_text_cursor.eo
+++ b/src/lib/efl/interfaces/efl_text_cursor.eo
@@ -62,7 +62,7 @@ interface Efl.Text.Cursor {
             content: Eina.Unicode; [[The unicode codepoint of the character]]
          }
          keys {
-            cur: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor object]]
+            @cref cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       @property cursor_geometry {
@@ -79,7 +79,7 @@ interface Efl.Text.Cursor {
             return: bool; [[ $true if split cursor, $false otherwise.]]
          }
          keys {
-            cur: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor object]]
+            @cref cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
             ctype: Efl.Text.Cursor.Cursor_Type; [[The type of the cursor.]]
          }
          values {
@@ -109,8 +109,8 @@ interface Efl.Text.Cursor {
       	 [[Check if two cursors are equal]]
          legacy: null;
          params {
-            cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor 1 object]]
-            cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor 2 object]]
+            @cref cur1: Efl.Text.Cursor.Cursor; [[Cursor 1 object]]
+            @cref cur2: Efl.Text.Cursor.Cursor; [[Cursor 2 object]]
          }
          return: bool; [[$true if cursors are equal, $false otherwise]]
       }
@@ -118,8 +118,8 @@ interface Efl.Text.Cursor {
       	 [[Compare two cursors]]
          legacy: null;
          params {
-            cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor 1 object]]
-            cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[Cursor 2 object]]
+            @cref cur1: Efl.Text.Cursor.Cursor; [[Cursor 1 object]]
+            @cref cur2: Efl.Text.Cursor.Cursor; [[Cursor 2 object]]
          }
          return: int; [[Difference between cursors]]
       }
@@ -127,99 +127,99 @@ interface Efl.Text.Cursor {
       	 [[Copy existing cursor]]
          legacy: null;
          params {
-            dst: ptr(Efl.Text.Cursor.Cursor); [[Destination cursor]]
-            src: ptr(const(Efl.Text.Cursor.Cursor)); [[Source cursor]]
+            @out dst: Efl.Text.Cursor.Cursor; [[Destination cursor]]
+            @cref src: Efl.Text.Cursor.Cursor; [[Source cursor]]
          }
       }
       cursor_char_next {
       	 [[Advances to the next character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_char_prev {
       	 [[Advances to the previous character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_char_first {
       	 [[Advances to the first character in this paragraph]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_char_last {
       	 [[Advances to the last character in this paragraph]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_word_start {
       	 [[Advance to current word start]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_word_end {
       	 [[Advance to current word end]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_line_char_first {
       	 [[Advance to current line first character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_line_char_last {
       	  [[Advance to current line last character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_first {
       	 [[Advance to current paragraph first character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_last {
       	 [[Advance to current paragraph last character]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_next {
          [[Advances to the start of the next text node]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_paragraph_prev {
          [[Advances to the end of the previous text node]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
       cursor_line_jump_by {
       	 [[Jump the cursor by the given number of lines]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
             by: int; [[Number of lines]]
          }
       }
@@ -227,7 +227,7 @@ interface Efl.Text.Cursor {
       	 [[Set cursor coordinates]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
             @in x: int; [[X coord to set by.]]
             @in y: int; [[Y coord to set by.]]
          }
@@ -238,7 +238,7 @@ interface Efl.Text.Cursor {
          ]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
             @in text: string; [[Text to append (UTF-8 format).]]
          }
          return: int; [[Length of the appended text.]]
@@ -247,7 +247,7 @@ interface Efl.Text.Cursor {
          [[Deletes a single character from position pointed by given cursor.]]
          legacy: null;
          params {
-            cur: ptr(Efl.Text.Cursor.Cursor); [[Cursor object]]
+            @inout cur: Efl.Text.Cursor.Cursor; [[Cursor object]]
          }
       }
    }
diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo
index db04d5b5de..61e309ab8a 100644
--- a/src/lib/eldbus/eldbus_model_method.eo
+++ b/src/lib/eldbus/eldbus_model_method.eo
@@ -9,7 +9,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) {
               @since 1.16]]
             params {
                 @in proxy: ptr(Eldbus.Proxy); [[Eldbus proxy]]
-                @in method: ptr(const(Eldbus.Introspection.Method)); [[The introspected method]]
+                @cref method: Eldbus.Introspection.Method; [[The introspected method]]
             }
         }
         call {
diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo
index a76a6a3361..31221ca742 100644
--- a/src/lib/eldbus/eldbus_model_proxy.eo
+++ b/src/lib/eldbus/eldbus_model_proxy.eo
@@ -10,7 +10,7 @@ class Eldbus.Model.Proxy (Efl.Object, Efl.Model) {
               @since 1.16]]
             params {
                 @in object: ptr(Eldbus.Object); [[Eldbus object]]
-                @in interface: ptr(const(Eldbus.Introspection.Interface)); [[The introspected interface]]
+                @cref interface: Eldbus.Introspection.Interface; [[The introspected interface]]
             }
         }
     @property name {
diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo
index 443968afa4..2a27fde209 100644
--- a/src/lib/eldbus/eldbus_model_signal.eo
+++ b/src/lib/eldbus/eldbus_model_signal.eo
@@ -8,7 +8,7 @@ class Eldbus.Model.Signal (Eldbus.Model.Arguments) {
                 @since 1.16]]
             params {
                 @in proxy: ptr(Eldbus.Proxy); [[Eldbus proxy]]
-                @in signal: ptr(const(Eldbus.Introspection.Signal)); [[The introspected method]]
+                @cref signal: Eldbus.Introspection.Signal; [[The introspected method]]
             }
         }
     }
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index ceef80e08c..951a5748ce 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -212,14 +212,14 @@ abstract Efl.Object ()
       event_callback_forwarder_add {
          [[Add an event callback forwarder for an event and an object.]]
          params {
-            @in desc: ptr(const(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 {
-            @in desc: ptr(const(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]]
          }
       }
diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo
index b6626acca4..efb1981387 100644
--- a/src/lib/evas/canvas/efl_canvas_object.eo
+++ b/src/lib/evas/canvas/efl_canvas_object.eo
@@ -660,7 +660,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       event_animation_set {
          [[Set the $animation which starts when the given $event_name happens to the object.]]
          params {
-            @in event_type: ptr(const(Efl.Event.Description));
+            @cref event_type: Efl.Event.Description;
                [[The event description for which the given $animation is set.]]
             @in animation: Efl.Animation;
                [[The animation which starts when the given $event_name happens to the object.]]
@@ -670,7 +670,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator,
       event_animation_get {
          [[Get the $animation which starts when the given $event happens to the object.]]
          params {
-            @in event_type: ptr(const(Efl.Event.Description)); [[The event description for which the given $animation is set.]]
+            @cref event_type: Efl.Event.Description; [[The event description for which the given $animation is set.]]
          }
          legacy: null;
          return: Efl.Animation @warn_unused;
diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo
index 891dc97e94..d2fce3b1c2 100644
--- a/src/lib/evas/canvas/efl_canvas_text.eo
+++ b/src/lib/evas/canvas/efl_canvas_text.eo
@@ -162,8 +162,8 @@ Efl.Text.Cursor, Efl.Text.Annotate, Efl.Text.Markup)
          legacy: null;
          return: mstring @owned; [[The text in the given range]]
          params {
-            @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
-            @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
+            @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
+            @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
          }
       }
       range_geometry_get {
@@ -176,8 +176,8 @@ Efl.Text.Cursor, Efl.Text.Annotate, Efl.Text.Markup)
          ]]
          legacy: null;
          params {
-             @in cur1: const(ptr(Efl.Text.Cursor.Cursor)); [[Start of range]]
-             @in cur2: const(ptr(Efl.Text.Cursor.Cursor)); [[End of range]]
+             @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
+             @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
          }
          return: iterator<ptr(Eina.Rect)> @owned; [[
             Iterator on all geoemtries of the given range
@@ -194,8 +194,8 @@ Efl.Text.Cursor, Efl.Text.Annotate, Efl.Text.Markup)
          ]]
          legacy: null;
          params {
-             @in cur1: ptr(const(Efl.Text.Cursor.Cursor)); [[Start of range]]
-             @in cur2: ptr(const(Efl.Text.Cursor.Cursor)); [[End of range]]
+             @cref cur1: Efl.Text.Cursor.Cursor; [[Start of range]]
+             @cref cur2: Efl.Text.Cursor.Cursor; [[End of range]]
          }
          return: iterator<ptr(Eina.Rect)> @owned; [[
             Iterator on all simple geometries of the given range
diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo
index e44a852eaa..ecb514133b 100644
--- a/src/lib/evas/canvas/efl_vg.eo
+++ b/src/lib/evas/canvas/efl_vg.eo
@@ -42,7 +42,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack)
               @since 1.14]]
          }
          values {
-            m: ptr(const(Eina.Matrix3)); [[Transformation matrix.]]
+            @cref m: Eina.Matrix3; [[Transformation matrix.]]
          }
       }
       @property origin {
diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo
index 369068862b..1bf9afa330 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -126,7 +126,7 @@ class Evas.Textgrid (Efl.Canvas.Object, Efl.Text.Properties, Efl.Text.Font)
 
          params {
             @in y: int; [[The row index of the grid.]]
-            @in row: ptr(const(Evas.Textgrid.Cell)); [[The string as a sequence of #Evas_Textgrid_Cell.]]
+            @cref row: Evas.Textgrid.Cell; [[The string as a sequence of #Evas_Textgrid_Cell.]]
          }
       }
       cellrow_get @const {
diff --git a/src/lib/evas/gesture/efl_gesture.eo b/src/lib/evas/gesture/efl_gesture.eo
index 145e32a998..18881a7471 100644
--- a/src/lib/evas/gesture/efl_gesture.eo
+++ b/src/lib/evas/gesture/efl_gesture.eo
@@ -8,7 +8,7 @@ abstract Efl.Gesture(Efl.Object)
          get {
          }
          values {
-            type: ptr(const(Efl.Event.Description)); [[gesture type]]
+            @cref type: Efl.Event.Description; [[gesture type]]
          }
       }
       @property state {