diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo
index 804c60942b..0d62cdab97 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -121,7 +121,7 @@ class Ecore_Audio_In (Ecore_Audio)
             ]]
          }
          values {
-            output: Eo *; [[The output]]
+            output: Ecore_Audio *; [[The output]] /* FIXME-cyclic Should be Ecore_Audio_Out */
          }
       }
       @property remaining {
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo b/src/lib/ecore_audio/ecore_audio_out.eo
index 465dce64bd..cd25f87c8b 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -11,7 +11,7 @@ class Ecore_Audio_Out (Ecore_Audio)
          ]]
          return: bool; [[true if the input was attached, false otherwise]]
          params {
-            @in input: Eo *; [[The input to attach to the output]]
+            @in input: Ecore_Audion_In *; [[The input to attach to the output]]
          }
       }
       input_detach {
@@ -21,7 +21,7 @@ class Ecore_Audio_Out (Ecore_Audio)
          ]]
          return: bool; [[true if the input was detached, false otherwise]]
          params {
-            @in input: Eo *; [[The input to detach to the output]]
+            @in input: Ecore_Audio_In *; [[The input to detach to the output]]
          }
       }
       inputs_get {
@@ -29,7 +29,7 @@ class Ecore_Audio_Out (Ecore_Audio)
 
            @since 1.8
          ]]
-         return: list<Eo*> *; [[A list of the inputs that are attached to the output]]
+         return: list<Ecore_Audio_In*> *; [[A list of the inputs that are attached to the output]]
       }
    }
    implements {