diff --git a/src/bin/eolian_mono/eolian/mono/name_helpers.hh b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
index 8104a78af6..a1fd8cd6d0 100644
--- a/src/bin/eolian_mono/eolian/mono/name_helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/name_helpers.hh
@@ -293,11 +293,9 @@ struct klass_interface_name_generator
   template <typename T>
   std::string operator()(T const& klass) const
   {
-    std::string name = utils::remove_all(klass.eolian_name, '_');
-    if (klass.type == attributes::class_type::mixin || klass.type == attributes::class_type::interface_)
-      return "I" + name;
-    else
-      return name;
+     return ((klass.type == attributes::class_type::mixin
+              || klass.type == attributes::class_type::interface_) ? "I" : "")
+       + utils::remove_all(klass.eolian_name, '_');
   }
 
   template <typename OutputIterator, typename Attr, typename Context>
@@ -325,10 +323,9 @@ struct klass_full_interface_name_generator
 template<typename T>
 inline std::string klass_concrete_name(T const& klass)
 {
-  if (klass.type == attributes::class_type::mixin || klass.type == attributes::class_type::interface_)
-    return klass_interface_name(klass) + "Concrete";
-
-  return utils::remove_all(klass.eolian_name, '_');
+   return utils::remove_all(klass.eolian_name, '_') + ((klass.type == attributes::class_type::mixin
+           || klass.type == attributes::class_type::interface_)
+                                                       ? "Concrete" : "");
 }
 
 template<typename  T>
@@ -425,7 +422,7 @@ inline std::string managed_event_name(std::string const& name)
 
 inline std::string managed_event_args_short_name(attributes::event_def const& evt)
 {
-   return klass_concrete_or_interface_name(evt.klass) + name_helpers::managed_event_name(evt.name) + "Args";
+   return utils::remove_all(evt.klass.eolian_name, '_') + name_helpers::managed_event_name(evt.name) + "Args";
 }
 
 inline std::string managed_event_args_name(attributes::event_def evt)
diff --git a/src/bindings/mono/efl_mono/GenericModel.cs b/src/bindings/mono/efl_mono/GenericModel.cs
index 95389f8ddb..25d9c79955 100644
--- a/src/bindings/mono/efl_mono/GenericModel.cs
+++ b/src/bindings/mono/efl_mono/GenericModel.cs
@@ -125,7 +125,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel, IDisposable
    }
 
    /// <summary>Event triggered when properties on the wrapped model changes.</summary>
-   public event EventHandler<Efl.IModelPropertiesChangedEventArgs> PropertiesChangedEvent
+   public event EventHandler<Efl.ModelPropertiesChangedEventArgs> PropertiesChangedEvent
    {
       add {
           model.PropertiesChangedEvent += value;
@@ -136,7 +136,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel, IDisposable
    }
 
    /// <summary>Event triggered when a child is added from the wrapped model.</summary>
-   public event EventHandler<Efl.IModelChildAddedEventArgs> ChildAddedEvent
+   public event EventHandler<Efl.ModelChildAddedEventArgs> ChildAddedEvent
    {
       add {
           model.ChildAddedEvent += value;
@@ -147,7 +147,7 @@ public class GenericModel<T> : Efl.Object, Efl.IModel, IDisposable
    }
 
    /// <summary>Event triggered when a child is removed from the wrapped model.</summary>
-   public event EventHandler<Efl.IModelChildRemovedEventArgs> ChildRemovedEvent
+   public event EventHandler<Efl.ModelChildRemovedEventArgs> ChildRemovedEvent
    {
       add {
           model.ChildRemovedEvent += value;
diff --git a/src/tests/efl_mono/Model.cs b/src/tests/efl_mono/Model.cs
index 829accfb5c..4ec6ef3f0b 100644
--- a/src/tests/efl_mono/Model.cs
+++ b/src/tests/efl_mono/Model.cs
@@ -66,7 +66,7 @@ public class TestModel {
         string propertyBound = null;
         bool callbackCalled = false;
         var factory = new Efl.Ui.ItemFactory<Efl.Ui.Button>();
-        factory.PropertyBoundEvent += (object sender, Efl.Ui.IPropertyBindPropertyBoundEventArgs args) => {
+        factory.PropertyBoundEvent += (object sender, Efl.Ui.PropertyBindPropertyBoundEventArgs args) => {
             propertyBound = args.arg;
             callbackCalled = true;
         };