diff --git a/src/bindings/mono/eina_mono/eina_array.cs b/src/bindings/mono/eina_mono/eina_array.cs
index 7ebb7ed31e..ce26acdd9a 100644
--- a/src/bindings/mono/eina_mono/eina_array.cs
+++ b/src/bindings/mono/eina_mono/eina_array.cs
@@ -147,12 +147,10 @@ public class Array<T> : IEnumerable<T>, IDisposable
     [EditorBrowsable(EditorBrowsableState.Never)]
     public Array(IntPtr handle, bool own)
     {
-        if (handle == IntPtr.Zero)
-        {
-            throw new ArgumentNullException("handle", "Handle can't be null");
-        }
-
-        Handle = handle;
+        Handle = (handle != IntPtr.Zero)
+            ? handle
+            : throw new ArgumentNullException(nameof(handle),
+                                              $"{nameof(Handle)} can't be null");
         Own = own;
         OwnContent = own;
     }
@@ -166,12 +164,10 @@ public class Array<T> : IEnumerable<T>, IDisposable
     [EditorBrowsable(EditorBrowsableState.Never)]
     public Array(IntPtr handle, bool own, bool ownContent)
     {
-        if (handle == IntPtr.Zero)
-        {
-            throw new ArgumentNullException("handle", "Handle can't be null");
-        }
-
-        Handle = handle;
+        Handle = (handle != IntPtr.Zero)
+            ? handle
+            : throw new ArgumentNullException(nameof(handle),
+                                              $"{nameof(Handle)} can't be null");
         Own = own;
         OwnContent = ownContent;
     }
diff --git a/src/bindings/mono/eldbus_mono/eldbus_connection.cs b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
index c2120600d3..ba54408ea7 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_connection.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_connection.cs
@@ -298,7 +298,7 @@ public class Connection : IDisposable
 
         if (msg == null)
         {
-            throw new ArgumentNullException("msg");
+            throw new ArgumentNullException(nameof(msg));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
@@ -347,7 +347,7 @@ public class Connection : IDisposable
 
         if (bus == null)
         {
-            throw new ArgumentNullException("bus");
+            throw new ArgumentNullException(nameof(bus));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
@@ -376,7 +376,7 @@ public class Connection : IDisposable
 
         if (bus == null)
         {
-            throw new ArgumentNullException("bus");
+            throw new ArgumentNullException(nameof(bus));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
@@ -405,7 +405,7 @@ public class Connection : IDisposable
 
         if (bus == null)
         {
-            throw new ArgumentNullException("bus");
+            throw new ArgumentNullException(nameof(bus));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
@@ -434,7 +434,7 @@ public class Connection : IDisposable
 
         if (bus == null)
         {
-            throw new ArgumentNullException("bus");
+            throw new ArgumentNullException(nameof(bus));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
@@ -533,7 +533,7 @@ public class Connection : IDisposable
 
         if (bus == null)
         {
-            throw new ArgumentNullException("bus");
+            throw new ArgumentNullException(nameof(bus));
         }
 
         IntPtr cb_wrapper = (dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr());
diff --git a/src/bindings/mono/eldbus_mono/eldbus_object.cs b/src/bindings/mono/eldbus_mono/eldbus_object.cs
index 329bd34a54..3c77d258c4 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_object.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_object.cs
@@ -146,17 +146,17 @@ public class Object : System.IDisposable
     {
         if (conn == null)
         {
-            throw new System.ArgumentNullException("conn");
+            throw new System.ArgumentNullException(nameof(conn));
         }
 
         if (bus == null)
         {
-            throw new System.ArgumentNullException("bus");
+            throw new System.ArgumentNullException(nameof(bus));
         }
 
         if (path == null)
         {
-            throw new System.ArgumentNullException("path");
+            throw new System.ArgumentNullException(nameof(path));
         }
 
         var handle = eldbus_object_get(conn.Handle, bus, path);
@@ -316,7 +316,7 @@ public class Object : System.IDisposable
 
         if (msg == null)
         {
-            throw new System.ArgumentNullException("msg");
+            throw new System.ArgumentNullException(nameof(msg));
         }
 
         IntPtr cb_wrapper = dlgt == null ? IntPtr.Zero : eldbus.Common.GetMessageCbWrapperPtr();
diff --git a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
index 7fc48d3095..a3a984df97 100644
--- a/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
+++ b/src/bindings/mono/eldbus_mono/eldbus_proxy.cs
@@ -24,7 +24,7 @@ using static eldbus.EldbusProxyNativeFunctions;
 namespace eldbus
 {
 
-[EditorBrowsable(EditorBrowsableState.Never)]    
+[EditorBrowsable(EditorBrowsableState.Never)]
 internal static class EldbusProxyNativeFunctions
 {
     [DllImport(efl.Libs.Eldbus)] public static extern IntPtr
@@ -215,7 +215,7 @@ public class Proxy : IDisposable
 
         if (member == null)
         {
-            throw new ArgumentNullException("member");
+            throw new ArgumentNullException(nameof(member));
         }
 
         var ptr = eldbus_proxy_method_call_new(Handle, member);
@@ -233,7 +233,7 @@ public class Proxy : IDisposable
 
         if (msg == null)
         {
-            throw new ArgumentNullException("msg");
+            throw new ArgumentNullException(nameof(msg));
         }
 
         // Native send() takes ownership of the message. We ref here to keep the IDisposable