diff --git a/src/bin/eolian_cxx/convert.cc b/src/bin/eolian_cxx/convert.cc
index 4a6ea4bb39..1e353eb041 100644
--- a/src/bin/eolian_cxx/convert.cc
+++ b/src/bin/eolian_cxx/convert.cc
@@ -38,8 +38,8 @@ convert_eolian_parameters(Eina_List const* parameters,
           (static_cast<const Eolian_Function_Parameter*>(curr));
         list.push_back
           ({
-             parameter_type(id, func_type),
-             parameter_name(id)
+             parameter_type(*id, func_type),
+             parameter_name(*id)
           });
      }
    return list;
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh b/src/bin/eolian_cxx/eolian_wrappers.hh
index f7a8163d92..62a6d2f516 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -233,58 +233,58 @@ property_is_setter(Eolian_Function const& func)
 }
 
 inline std::string
-parameter_name(Eolian_Function_Parameter const *& parameter)
+parameter_name(Eolian_Function_Parameter const& parameter)
 {
-   return safe_strshare(::eolian_parameter_name_get(parameter)) + "_";
+   return safe_strshare(::eolian_parameter_name_get(&parameter)) + "_";
 }
 
 inline bool
-parameter_is_out(Eolian_Function_Parameter const *& parameter)
+parameter_is_out(Eolian_Function_Parameter const& parameter)
 {
    Eolian_Parameter_Dir direction;
-   ::eolian_parameter_information_get(parameter, &direction, NULL, NULL, NULL);
+   ::eolian_parameter_information_get(&parameter, &direction, NULL, NULL, NULL);
    return direction == EOLIAN_OUT_PARAM || direction == EOLIAN_INOUT_PARAM;
 }
 
 inline bool
-parameter_is_const(Eolian_Function_Parameter const *& parameter,
+parameter_is_const(Eolian_Function_Parameter const& parameter,
                    Eolian_Function_Type func_type)
 {
    return ::eolian_parameter_const_attribute_get
-     (parameter, property_is_getter(func_type));
+     (&parameter, property_is_getter(func_type));
 }
 
 inline bool
-parameter_is_const(Eolian_Function_Parameter const *& parameter,
+parameter_is_const(Eolian_Function_Parameter const& parameter,
                    getter_t func_type)
 {
    return ::eolian_parameter_const_attribute_get
-     (parameter, property_is_getter(func_type.value));
+     (&parameter, property_is_getter(func_type.value));
 }
 
 inline bool
-parameter_is_const(Eolian_Function_Parameter const *& parameter,
+parameter_is_const(Eolian_Function_Parameter const& parameter,
                    setter_t func_type)
 {
    return ::eolian_parameter_const_attribute_get
-     (parameter, property_is_getter(func_type.value));
+     (&parameter, property_is_getter(func_type.value));
 }
 
 inline bool
-parameter_is_const(Eolian_Function_Parameter const *& parameter,
+parameter_is_const(Eolian_Function_Parameter const& parameter,
                    Eolian_Function const& func)
 {
    assert(function_type(func) != EOLIAN_PROPERTY);
    return ::eolian_parameter_const_attribute_get
-     (parameter, property_is_getter(func));
+     (&parameter, property_is_getter(func));
 }
 
 inline efl::eolian::eolian_type_instance
-parameter_type(Eolian_Function_Parameter const *& parameter,
+parameter_type(Eolian_Function_Parameter const& parameter,
                Eolian_Function_Type func_type = method_t::value)
 {
    efl::eolian::eolian_type_instance type
-     (type_lookup(::eolian_parameter_type_get(parameter)));
+     (type_lookup(::eolian_parameter_type_get(&parameter)));
    assert(!type.empty());
    // XXX implement complex types.
    if (parameter_is_out(parameter))
@@ -295,13 +295,13 @@ parameter_type(Eolian_Function_Parameter const *& parameter,
 }
 
 inline efl::eolian::eolian_type_instance
-parameter_type(Eolian_Function_Parameter const *& parameter, getter_t func_type)
+parameter_type(Eolian_Function_Parameter const& parameter, getter_t func_type)
 {
    return parameter_type(parameter, func_type.value);
 }
 
 inline efl::eolian::eolian_type_instance
-parameter_type(Eolian_Function_Parameter const *& parameter, setter_t func_type)
+parameter_type(Eolian_Function_Parameter const& parameter, setter_t func_type)
 {
    return parameter_type(parameter, func_type.value);
 }