diff --git a/src/ElectronNET.API/API/ApiBase.cs b/src/ElectronNET.API/API/ApiBase.cs
index ec63c743..f2b061c8 100644
--- a/src/ElectronNET.API/API/ApiBase.cs
+++ b/src/ElectronNET.API/API/ApiBase.cs
@@ -29,15 +29,15 @@ protected enum SocketEventNameTypes
             CamelCase,
         }
 
-        private const int PropertyTimeout = 1000;
+        private const int InvocationTimeout = 1000;
 
         private readonly string objectName;
-        private readonly ConcurrentDictionary<string, PropertyGetter> propertyGetters;
-        private readonly ConcurrentDictionary<string, string> propertyEventNames = new();
-        private readonly ConcurrentDictionary<string, string> propertyMessageNames = new();
+        private readonly ConcurrentDictionary<string, Invocator> invocators;
+        private readonly ConcurrentDictionary<string, string> invocationEventNames = new();
+        private readonly ConcurrentDictionary<string, string> invocationMessageNames = new();
         private readonly ConcurrentDictionary<string, string> methodMessageNames = new();
         private static readonly ConcurrentDictionary<string, EventContainer> eventContainers = new();
-        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<string, PropertyGetter>> AllPropertyGetters = new();
+        private static readonly ConcurrentDictionary<string, ConcurrentDictionary<string, Invocator>> AllInvocators = new();
 
         private readonly object objLock = new object();
 
@@ -58,7 +58,7 @@ protected set
         protected ApiBase()
         {
             this.objectName = this.GetType().Name.LowerFirst();
-            propertyGetters = AllPropertyGetters.GetOrAdd(objectName, _ => new ConcurrentDictionary<string, PropertyGetter>());
+            this.invocators = AllInvocators.GetOrAdd(this.objectName, _ => new ConcurrentDictionary<string, Invocator>());
         }
 
         protected void CallMethod0([CallerMemberName] string callerName = null)
@@ -113,21 +113,21 @@ protected void CallMethod3(object val1, object val2, object val3, [CallerMemberN
             }
         }
 
-        protected Task<T> GetPropertyAsync<T>(object arg = null, [CallerMemberName] string callerName = null)
+        protected Task<T> InvokeAsync<T>(object arg = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
 
             lock (this.objLock)
             {
-                return this.propertyGetters.GetOrAdd(callerName, _ =>
+                return this.invocators.GetOrAdd(callerName, _ =>
                 {
-                    var getter = new PropertyGetter<T>(this, callerName, PropertyTimeout, arg);
+                    var getter = new Invocator<T>(this, callerName, InvocationTimeout, arg);
 
                     getter.Task<T>().ContinueWith(_ =>
                     {
                         lock (this.objLock)
                         {
-                            return this.propertyGetters.TryRemove(callerName, out var _);
+                            return this.invocators.TryRemove(callerName, out var _);
                         }
                     });
 
@@ -135,15 +135,15 @@ protected Task<T> GetPropertyAsync<T>(object arg = null, [CallerMemberName] stri
                 }).Task<T>();
             }
         }
-        
+
         protected void AddEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 var container = eventContainers.GetOrAdd(eventKey, _ =>
                 {
@@ -156,14 +156,14 @@ protected void AddEvent(Action value, int? id = null, [CallerMemberName] string
                 container.Register(value);
             }
         }
-         
+
         protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))
                 {
@@ -172,15 +172,15 @@ protected void RemoveEvent(Action value, int? id = null, [CallerMemberName] stri
                 }
             }
         }
-       
+
         protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
 
-            lock (objLock)
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
+
+            lock (this.objLock)
             {
                 var container = eventContainers.GetOrAdd(eventKey, _ =>
                 {
@@ -197,10 +197,10 @@ protected void AddEvent<T>(Action<T> value, int? id = null, [CallerMemberName] s
         protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName] string callerName = null)
         {
             Debug.Assert(callerName != null, nameof(callerName) + " != null");
-            var eventName = EventName(callerName);
-            var eventKey = EventKey(eventName, id);
+            var eventName = this.EventName(callerName);
+            var eventKey = this.EventKey(eventName, id);
 
-            lock (objLock)
+            lock (this.objLock)
             {
                 if (eventContainers.TryGetValue(eventKey, out var container) && !container.Unregister(value))
                 {
@@ -212,33 +212,33 @@ protected void RemoveEvent<T>(Action<T> value, int? id = null, [CallerMemberName
 
         private string EventName(string callerName)
         {
-            switch (SocketEventNameType)
+            switch (this.SocketEventNameType)
             {
                 case SocketEventNameTypes.DashedLower:
-                    return $"{objectName}-{callerName.ToDashedEventName()}";
+                    return $"{this.objectName}-{callerName.ToDashedEventName()}";
                 case SocketEventNameTypes.CamelCase:
-                    return $"{objectName}-{callerName.ToCamelCaseEventName()}";
+                    return $"{this.objectName}-{callerName.ToCamelCaseEventName()}";
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
-        
+
         private string EventKey(string eventName, int? id)
         {
             return string.Format(CultureInfo.InvariantCulture, "{0}{1:D}", eventName, id);
         }
 
-        internal abstract class PropertyGetter
+        internal abstract class Invocator
         {
             public abstract Task<T> Task<T>();
         }
 
-        internal class PropertyGetter<T> : PropertyGetter
+        internal class Invocator<T> : Invocator
         {
             private readonly Task<T> tcsTask;
             private TaskCompletionSource<T> tcs;
 
-            public PropertyGetter(ApiBase apiBase, string callerName, int timeoutMs, object arg = null)
+            public Invocator(ApiBase apiBase, string callerName, int timeoutMs, object arg = null)
             {
                 this.tcs = new TaskCompletionSource<T>(TaskCreationOptions.RunContinuationsAsynchronously);
                 this.tcsTask = this.tcs.Task;
@@ -249,22 +249,22 @@ public PropertyGetter(ApiBase apiBase, string callerName, int timeoutMs, object
                 switch (apiBase.SocketTaskEventNameType)
                 {
                     case SocketTaskEventNameTypes.DashesLowerFirst:
-                        eventName = apiBase.propertyEventNames.GetOrAdd(callerName, s => $"{apiBase.objectName}-{s.StripAsync().LowerFirst()}-completed");
+                        eventName = apiBase.invocationEventNames.GetOrAdd(callerName, s => $"{apiBase.objectName}-{s.StripAsync().LowerFirst()}-completed");
                         break;
                     case SocketTaskEventNameTypes.NoDashUpperFirst:
-                        eventName = apiBase.propertyEventNames.GetOrAdd(callerName, s => $"{apiBase.objectName}{s.StripAsync()}Completed");
+                        eventName = apiBase.invocationEventNames.GetOrAdd(callerName, s => $"{apiBase.objectName}{s.StripAsync()}Completed");
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
-                
+
                 switch (apiBase.SocketTaskMessageNameType)
                 {
                     case SocketTaskMessageNameTypes.DashesLowerFirst:
-                        messageName = apiBase.propertyMessageNames.GetOrAdd(callerName, s => $"{apiBase.objectName}-{s.StripAsync().LowerFirst()}");
+                        messageName = apiBase.invocationMessageNames.GetOrAdd(callerName, s => $"{apiBase.objectName}-{s.StripAsync().LowerFirst()}");
                         break;
                     case SocketTaskMessageNameTypes.NoDashUpperFirst:
-                        messageName = apiBase.propertyMessageNames.GetOrAdd(callerName, s => apiBase.objectName + s.StripAsync());
+                        messageName = apiBase.invocationMessageNames.GetOrAdd(callerName, s => apiBase.objectName + s.StripAsync());
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
@@ -289,17 +289,17 @@ public PropertyGetter(ApiBase apiBase, string callerName, int timeoutMs, object
                         }
                     }
                 });
-                
+
                 if (arg != null)
                 {
-                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) :  BridgeConnector.Socket.Emit(messageName, arg);
+                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id, arg) : BridgeConnector.Socket.Emit(messageName, arg);
                 }
                 else
                 {
-                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) :  BridgeConnector.Socket.Emit(messageName);
+                    _ = apiBase.Id >= 0 ? BridgeConnector.Socket.Emit(messageName, apiBase.Id) : BridgeConnector.Socket.Emit(messageName);
                 }
 
-                System.Threading.Tasks.Task.Delay(PropertyTimeout).ContinueWith(_ =>
+                System.Threading.Tasks.Task.Delay(InvocationTimeout).ContinueWith(_ =>
                 {
                     if (this.tcs != null)
                     {
@@ -321,7 +321,7 @@ public override Task<T1> Task<T1>()
                 return this.tcsTask as Task<T1>;
             }
         }
-        
+
         [SuppressMessage("ReSharper", "InconsistentlySynchronizedField")]
         private class EventContainer
         {
@@ -330,41 +330,41 @@ private class EventContainer
 
             private Action<T> GetEventActionT<T>()
             {
-                return (Action<T>)eventActionT;
+                return (Action<T>)this.eventActionT;
             }
 
             private void SetEventActionT<T>(Action<T> actionT)
             {
-                eventActionT = actionT;
+                this.eventActionT = actionT;
             }
 
-            public void OnEventAction() => eventAction?.Invoke();
+            public void OnEventAction() => this.eventAction?.Invoke();
 
-            public void OnEventActionT<T>(T p) => GetEventActionT<T>()?.Invoke(p);
+            public void OnEventActionT<T>(T p) => this.GetEventActionT<T>()?.Invoke(p);
 
             public void Register(Action receiver)
             {
-                eventAction += receiver;
+                this.eventAction += receiver;
             }
 
             public void Register<T>(Action<T> receiver)
             {
-                var actionT = GetEventActionT<T>();
+                var actionT = this.GetEventActionT<T>();
                 actionT += receiver;
-                SetEventActionT(actionT);
+                this.SetEventActionT(actionT);
             }
 
             public bool Unregister(Action receiver)
             {
-                eventAction -= receiver;
+                this.eventAction -= receiver;
                 return this.eventAction != null;
             }
 
             public bool Unregister<T>(Action<T> receiver)
             {
-                var actionT = GetEventActionT<T>();
+                var actionT = this.GetEventActionT<T>();
                 actionT -= receiver;
-                SetEventActionT(actionT);
+                this.SetEventActionT(actionT);
 
                 return actionT != null;
             }
diff --git a/src/ElectronNET.API/API/App.cs b/src/ElectronNET.API/API/App.cs
index 5a27e758..ee44f096 100644
--- a/src/ElectronNET.API/API/App.cs
+++ b/src/ElectronNET.API/API/App.cs
@@ -366,7 +366,7 @@ public Task<string> NameAsync
         {
             get
             {
-                return this.GetPropertyAsync<string>();
+                return this.InvokeAsync<string>();
             }
         }
 
@@ -501,7 +501,7 @@ public void Show()
         public async Task<string> GetAppPathAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<string>().ConfigureAwait(false);
+            return await this.InvokeAsync<string>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -565,7 +565,7 @@ public void SetPath(PathName name, string path)
         public async Task<string> GetVersionAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<string>().ConfigureAwait(false);
+            return await this.InvokeAsync<string>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -579,7 +579,7 @@ public async Task<string> GetVersionAsync(CancellationToken cancellationToken =
         public async Task<string> GetLocaleAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<string>().ConfigureAwait(false);
+            return await this.InvokeAsync<string>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -850,7 +850,7 @@ public async Task<bool> SetUserTasksAsync(UserTask[] userTasks, CancellationToke
         public async Task<JumpListSettings> GetJumpListSettingsAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<JumpListSettings>().ConfigureAwait(false);
+            return await this.InvokeAsync<JumpListSettings>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -941,7 +941,7 @@ public void ReleaseSingleInstanceLock()
         public async Task<bool> HasSingleInstanceLockAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<bool>().ConfigureAwait(false);
+            return await this.InvokeAsync<bool>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -980,7 +980,7 @@ public void SetUserActivity(string type, object userInfo, string webpageUrl)
         public async Task<string> GetCurrentActivityTypeAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<string>().ConfigureAwait(false);
+            return await this.InvokeAsync<string>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1043,7 +1043,7 @@ public async Task<int> ImportCertificateAsync(ImportCertificateOptions options,
         public async Task<ProcessMetric[]> GetAppMetricsAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<ProcessMetric[]>().ConfigureAwait(false);
+            return await this.InvokeAsync<ProcessMetric[]>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1055,7 +1055,7 @@ public async Task<ProcessMetric[]> GetAppMetricsAsync(CancellationToken cancella
         public async Task<GPUFeatureStatus> GetGpuFeatureStatusAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<GPUFeatureStatus>().ConfigureAwait(false);
+            return await this.InvokeAsync<GPUFeatureStatus>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1090,7 +1090,7 @@ public async Task<bool> SetBadgeCountAsync(int count, CancellationToken cancella
         public async Task<int> GetBadgeCountAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<int>().ConfigureAwait(false);
+            return await this.InvokeAsync<int>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1105,7 +1105,7 @@ public async Task<int> GetBadgeCountAsync(CancellationToken cancellationToken =
         public async Task<bool> IsUnityRunningAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<bool>().ConfigureAwait(false);
+            return await this.InvokeAsync<bool>().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -1166,7 +1166,7 @@ public void SetLoginItemSettings(LoginSettings loginSettings)
         public async Task<bool> IsAccessibilitySupportEnabledAsync(CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            return await this.GetPropertyAsync<bool>().ConfigureAwait(false);
+            return await this.InvokeAsync<bool>().ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/src/ElectronNET.API/API/AutoUpdater.cs b/src/ElectronNET.API/API/AutoUpdater.cs
index 0b5fd75f..639cd8ca 100644
--- a/src/ElectronNET.API/API/AutoUpdater.cs
+++ b/src/ElectronNET.API/API/AutoUpdater.cs
@@ -23,7 +23,7 @@ public bool AutoDownload
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<bool>()).Result;
+                return Task.Run(() => this.InvokeAsync<bool>()).Result;
             }
             set
             {
@@ -40,7 +40,7 @@ public bool AutoInstallOnAppQuit
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<bool>()).Result;
+                return Task.Run(() => this.InvokeAsync<bool>()).Result;
             }
             set
             {
@@ -58,7 +58,7 @@ public bool AllowPrerelease
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<bool>()).Result;
+                return Task.Run(() => this.InvokeAsync<bool>()).Result;
             }
             set
             {
@@ -74,7 +74,7 @@ public bool FullChangelog
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<bool>()).Result;
+                return Task.Run(() => this.InvokeAsync<bool>()).Result;
             }
             set
             {
@@ -91,7 +91,7 @@ public bool AllowDowngrade
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<bool>()).Result;
+                return Task.Run(() => this.InvokeAsync<bool>()).Result;
             }
             set
             {
@@ -106,7 +106,7 @@ public string UpdateConfigPath
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<string>()).Result;
+                return Task.Run(() => this.InvokeAsync<string>()).Result;
             }
         }
 
@@ -117,7 +117,7 @@ public Task<SemVer> CurrentVersionAsync
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<SemVer>());
+                return Task.Run(() => this.InvokeAsync<SemVer>());
             }
         }
 
@@ -142,7 +142,7 @@ public Task<string> ChannelAsync
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<string>());
+                return Task.Run(() => this.InvokeAsync<string>());
             }
         }
 
@@ -165,7 +165,7 @@ public Task<Dictionary<string, string>> RequestHeadersAsync
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<Dictionary<string, string>>());
+                return Task.Run(() => this.InvokeAsync<Dictionary<string, string>>());
             }
         }
 
diff --git a/src/ElectronNET.API/API/BrowserView.cs b/src/ElectronNET.API/API/BrowserView.cs
index 479d9712..32030736 100644
--- a/src/ElectronNET.API/API/BrowserView.cs
+++ b/src/ElectronNET.API/API/BrowserView.cs
@@ -30,7 +30,7 @@ public Rectangle Bounds
         {
             get
             {
-                return Task.Run(() => GetPropertyAsync<Rectangle>()).Result;
+                return Task.Run(() => this.InvokeAsync<Rectangle>()).Result;
             }
             set
             {
diff --git a/src/ElectronNET.API/API/BrowserWindow.cs b/src/ElectronNET.API/API/BrowserWindow.cs
index f4e7529f..7cb99386 100644
--- a/src/ElectronNET.API/API/BrowserWindow.cs
+++ b/src/ElectronNET.API/API/BrowserWindow.cs
@@ -313,13 +313,13 @@ internal BrowserWindow(int id)
     /// Whether the window is focused.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsFocusedAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsFocusedAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Whether the window is destroyed.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsDestroyedAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsDestroyedAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Shows and gives focus to the window.
@@ -340,13 +340,13 @@ internal BrowserWindow(int id)
     /// Whether the window is visible to the user.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsVisibleAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsVisibleAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Whether current window is a modal window.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsModalAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsModalAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Maximizes the window. This will also show (but not focus) the window if it isn’t being displayed already.
@@ -362,7 +362,7 @@ internal BrowserWindow(int id)
     /// Whether the window is maximized.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsMaximizedAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMaximizedAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Minimizes the window. On some platforms the minimized window will be shown in the Dock.
@@ -378,7 +378,7 @@ internal BrowserWindow(int id)
     /// Whether the window is minimized.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsMinimizedAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMinimizedAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window should be in fullscreen mode.
@@ -390,7 +390,7 @@ internal BrowserWindow(int id)
     /// Whether the window is in fullscreen mode.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsFullScreenAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsFullScreenAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// This will make a window maintain an aspect ratio. The extra size allows a developer to have space, 
@@ -466,7 +466,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Gets the bounds asynchronous.
     /// </summary>
     /// <returns></returns>
-    public Task<Rectangle> GetBoundsAsync() => this.GetPropertyAsync<Rectangle>();
+    public Task<Rectangle> GetBoundsAsync() => this.InvokeAsync<Rectangle>();
 
     /// <summary>
     /// Resizes and moves the window’s client area (e.g. the web page) to the supplied bounds.
@@ -485,7 +485,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Gets the content bounds asynchronous.
     /// </summary>
     /// <returns></returns>
-    public Task<Rectangle> GetContentBoundsAsync() => this.GetPropertyAsync<Rectangle>();
+    public Task<Rectangle> GetContentBoundsAsync() => this.InvokeAsync<Rectangle>();
 
     /// <summary>
     /// Resizes the window to width and height.
@@ -506,7 +506,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Contains the window’s width and height.
     /// </summary>
     /// <returns></returns>
-    public Task<int[]> GetSizeAsync() => this.GetPropertyAsync<int[]>();
+    public Task<int[]> GetSizeAsync() => this.InvokeAsync<int[]>();
 
     /// <summary>
     /// Resizes the window’s client area (e.g. the web page) to width and height.
@@ -527,7 +527,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Contains the window’s client area’s width and height.
     /// </summary>
     /// <returns></returns>
-    public Task<int[]> GetContentSizeAsync() => this.GetPropertyAsync<int[]>();
+    public Task<int[]> GetContentSizeAsync() => this.InvokeAsync<int[]>();
 
     /// <summary>
     /// Sets the minimum size of window to width and height.
@@ -540,7 +540,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Contains the window’s minimum width and height.
     /// </summary>
     /// <returns></returns>
-    public Task<int[]> GetMinimumSizeAsync() => this.GetPropertyAsync<int[]>();
+    public Task<int[]> GetMinimumSizeAsync() => this.InvokeAsync<int[]>();
 
     /// <summary>
     /// Sets the maximum size of window to width and height.
@@ -553,7 +553,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Contains the window’s maximum width and height.
     /// </summary>
     /// <returns></returns>
-    public Task<int[]> GetMaximumSizeAsync() => this.GetPropertyAsync<int[]>();
+    public Task<int[]> GetMaximumSizeAsync() => this.InvokeAsync<int[]>();
 
     /// <summary>
     /// Sets whether the window can be manually resized by user.
@@ -565,7 +565,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Whether the window can be manually resized by user.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsResizableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsResizableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window can be moved by user. On Linux does nothing.
@@ -579,7 +579,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// On Linux always returns true.
     /// </summary>
     /// <returns>On Linux always returns true.</returns>
-    public Task<bool> IsMovableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMovableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window can be manually minimized by user. On Linux does nothing.
@@ -593,7 +593,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// On Linux always returns true.
     /// </summary>
     /// <returns>On Linux always returns true.</returns>
-    public Task<bool> IsMinimizableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMinimizableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window can be manually maximized by user. On Linux does nothing.
@@ -607,7 +607,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// On Linux always returns true.
     /// </summary>
     /// <returns>On Linux always returns true.</returns>
-    public Task<bool> IsMaximizableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMaximizableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
@@ -619,7 +619,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Whether the maximize/zoom window button toggles fullscreen mode or maximizes the window.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsFullScreenableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsFullScreenableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window can be manually closed by user. On Linux does nothing.
@@ -633,7 +633,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// On Linux always returns true.
     /// </summary>
     /// <returns>On Linux always returns true.</returns>
-    public Task<bool> IsClosableAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsClosableAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window should show always on top of other windows. 
@@ -671,7 +671,7 @@ public void SetAspectRatio(int aspectRatio, Size extraSize) =>
     /// Whether the window is always on top of other windows.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsAlwaysOnTopAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsAlwaysOnTopAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Moves window to the center of the screen.
@@ -721,7 +721,7 @@ private bool isWindows10()
     /// Contains the window’s current position.
     /// </summary>
     /// <returns></returns>
-    public Task<int[]> GetPositionAsync() => this.GetPropertyAsync<int[]>();
+    public Task<int[]> GetPositionAsync() => this.InvokeAsync<int[]>();
 
     /// <summary>
     /// Changes the title of native window to title.
@@ -735,7 +735,7 @@ private bool isWindows10()
     /// Note: The title of web page can be different from the title of the native window.
     /// </summary>
     /// <returns></returns>
-    public Task<string> GetTitleAsync() => this.GetPropertyAsync<string>();
+    public Task<string> GetTitleAsync() => this.InvokeAsync<string>();
 
     /// <summary>
     /// Changes the attachment point for sheets on macOS. 
@@ -776,13 +776,13 @@ private bool isWindows10()
     /// Whether the window is in kiosk mode.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsKioskAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsKioskAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Returns the native type of the handle is HWND on Windows, NSView* on macOS, and Window (unsigned long) on Linux.
     /// </summary>
     /// <returns>string of the native handle obtained, HWND on Windows, NSView* on macOS, and Window (unsigned long) on Linux.</returns>
-    public Task<string> GetNativeWindowHandle() => this.GetPropertyAsync<string>();
+    public Task<string> GetNativeWindowHandle() => this.InvokeAsync<string>();
 
     /// <summary>
     /// Sets the pathname of the file the window represents, 
@@ -795,7 +795,7 @@ private bool isWindows10()
     /// The pathname of the file the window represents.
     /// </summary>
     /// <returns></returns>
-    public Task<string> GetRepresentedFilenameAsync() => this.GetPropertyAsync<string>();
+    public Task<string> GetRepresentedFilenameAsync() => this.InvokeAsync<string>();
 
     /// <summary>
     /// Specifies whether the window’s document has been edited, 
@@ -808,7 +808,7 @@ private bool isWindows10()
     /// Whether the window’s document has been edited.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsDocumentEditedAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsDocumentEditedAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Focuses the on web view.
@@ -920,7 +920,7 @@ public void SetProgressBar(double progress, ProgressBarOptions progressBarOption
     /// On Windows and Linux always returns true.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> HasShadowAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> HasShadowAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Gets the thumbar buttons.
@@ -1012,7 +1012,7 @@ public Task<bool> SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons)
     /// Whether menu bar automatically hides itself.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsMenuBarAutoHideAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMenuBarAutoHideAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the menu bar should be visible. If the menu bar is auto-hide,
@@ -1025,7 +1025,7 @@ public Task<bool> SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons)
     /// Whether the menu bar is visible.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsMenuBarVisibleAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsMenuBarVisibleAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Sets whether the window should be visible on all workspaces.
@@ -1041,7 +1041,7 @@ public Task<bool> SetThumbarButtonsAsync(ThumbarButton[] thumbarButtons)
     /// Note: This API always returns false on Windows.
     /// </summary>
     /// <returns></returns>
-    public Task<bool> IsVisibleOnAllWorkspacesAsync() => this.GetPropertyAsync<bool>();
+    public Task<bool> IsVisibleOnAllWorkspacesAsync() => this.InvokeAsync<bool>();
 
     /// <summary>
     /// Makes the window ignore all mouse events.
@@ -1090,7 +1090,7 @@ public void SetParentWindow(BrowserWindow parent)
     /// <returns></returns>
     public async Task<BrowserWindow> GetParentWindowAsync()
     {
-        var browserWindowId = await this.GetPropertyAsync<int>().ConfigureAwait(false);
+        var browserWindowId = await this.InvokeAsync<int>().ConfigureAwait(false);
         var browserWindow = Electron.WindowManager.BrowserWindows.ToList().Single(x => x.Id == browserWindowId);
         return browserWindow;
     }
@@ -1101,7 +1101,7 @@ public async Task<BrowserWindow> GetParentWindowAsync()
     /// <returns></returns>
     public async Task<List<BrowserWindow>> GetChildWindowsAsync()
     {
-        var browserWindowIds = await this.GetPropertyAsync<int[]>().ConfigureAwait(false);
+        var browserWindowIds = await this.InvokeAsync<int[]>().ConfigureAwait(false);
         var browserWindows = new List<BrowserWindow>();
 
         foreach (var id in browserWindowIds)
diff --git a/src/ElectronNET.API/API/Clipboard.cs b/src/ElectronNET.API/API/Clipboard.cs
index 5d067f6a..1a011be9 100644
--- a/src/ElectronNET.API/API/Clipboard.cs
+++ b/src/ElectronNET.API/API/Clipboard.cs
@@ -45,7 +45,7 @@ internal static Clipboard Instance
         /// </summary>
         /// <param name="type"></param>
         /// <returns>The content in the clipboard as plain text.</returns>
-        public Task<string> ReadTextAsync(string type = "") => GetPropertyAsync<string>(type);
+        public Task<string> ReadTextAsync(string type = "") => this.InvokeAsync<string>(type);
 
         /// <summary>
         /// Writes the text into the clipboard as plain text.
@@ -62,7 +62,7 @@ public void WriteText(string text, string type = "")
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public Task<string> ReadHTMLAsync(string type = "") => GetPropertyAsync<string>(type);
+        public Task<string> ReadHTMLAsync(string type = "") => this.InvokeAsync<string>(type);
 
         /// <summary>
         /// Writes markup to the clipboard.
@@ -79,7 +79,7 @@ public void WriteHTML(string markup, string type = "")
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public Task<string> ReadRTFAsync(string type = "") => GetPropertyAsync<string>(type);
+        public Task<string> ReadRTFAsync(string type = "") => this.InvokeAsync<string>(type);
 
         /// <summary>
         /// Writes the text into the clipboard in RTF.
@@ -97,7 +97,7 @@ public void WriteRTF(string text, string type = "")
         /// be empty strings when the bookmark is unavailable.
         /// </summary>
         /// <returns></returns>
-        public Task<ReadBookmark> ReadBookmarkAsync() => GetPropertyAsync<ReadBookmark>();
+        public Task<ReadBookmark> ReadBookmarkAsync() => this.InvokeAsync<ReadBookmark>();
 
         /// <summary>
         /// Writes the title and url into the clipboard as a bookmark.
@@ -120,7 +120,7 @@ public void WriteBookmark(string title, string url, string type = "")
         /// find pasteboard whenever the application is activated.
         /// </summary>
         /// <returns></returns>
-        public Task<string> ReadFindTextAsync() => GetPropertyAsync<string>();
+        public Task<string> ReadFindTextAsync() => this.InvokeAsync<string>();
 
         /// <summary>
         /// macOS: Writes the text into the find pasteboard as plain text. This method uses 
@@ -146,7 +146,7 @@ public void Clear(string type = "")
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public Task<string[]> AvailableFormatsAsync(string type = "") => GetPropertyAsync<string[]>(type);
+        public Task<string[]> AvailableFormatsAsync(string type = "") => this.InvokeAsync<string[]>(type);
 
         /// <summary>
         /// Writes data to the clipboard.
@@ -163,7 +163,7 @@ public void Write(Data data, string type = "")
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        public Task<NativeImage> ReadImageAsync(string type = "") => GetPropertyAsync<NativeImage>(type);
+        public Task<NativeImage> ReadImageAsync(string type = "") => this.InvokeAsync<NativeImage>(type);
 
         /// <summary>
         /// Writes an image to the clipboard.
diff --git a/src/ElectronNET.API/API/NativeTheme.cs b/src/ElectronNET.API/API/NativeTheme.cs
index c817b9d8..5e7c9915 100644
--- a/src/ElectronNET.API/API/NativeTheme.cs
+++ b/src/ElectronNET.API/API/NativeTheme.cs
@@ -107,26 +107,26 @@ public void SetThemeSource(ThemeSourceMode themeSourceMode)
         /// A <see cref="ThemeSourceMode"/> property that can be <see cref="ThemeSourceMode.System"/>, <see cref="ThemeSourceMode.Light"/> or <see cref="ThemeSourceMode.Dark"/>. It is used to override (<seealso cref="SetThemeSource"/>) and
         /// supercede the value that Chromium has chosen to use internally.
         /// </summary>
-        public Task<ThemeSourceMode> GetThemeSourceAsync() => GetPropertyAsync<ThemeSourceMode>();
+        public Task<ThemeSourceMode> GetThemeSourceAsync() => this.InvokeAsync<ThemeSourceMode>();
 
         /// <summary>
         /// A <see cref="bool"/> for if the OS / Chromium currently has a dark mode enabled or is
         /// being instructed to show a dark-style UI. If you want to modify this value you
         /// should use <see cref="SetThemeSource"/>.
         /// </summary>
-        public Task<bool> ShouldUseDarkColorsAsync() => GetPropertyAsync<bool>();
+        public Task<bool> ShouldUseDarkColorsAsync() => this.InvokeAsync<bool>();
 
         /// <summary>
         /// A <see cref="bool"/> for if the OS / Chromium currently has high-contrast mode enabled or is
         /// being instructed to show a high-contrast UI.
         /// </summary>
-        public Task<bool> ShouldUseHighContrastColorsAsync() => GetPropertyAsync<bool>();
+        public Task<bool> ShouldUseHighContrastColorsAsync() => this.InvokeAsync<bool>();
 
         /// <summary>
         /// A <see cref="bool"/> for if the OS / Chromium currently has an inverted color scheme or is
         /// being instructed to use an inverted color scheme.
         /// </summary>
-        public Task<bool> ShouldUseInvertedColorSchemeAsync() => GetPropertyAsync<bool>();
+        public Task<bool> ShouldUseInvertedColorSchemeAsync() => this.InvokeAsync<bool>();
 
         /// <summary>
         /// Emitted when something in the underlying NativeTheme has changed. This normally means that either the value of <see cref="ShouldUseDarkColorsAsync"/>,
diff --git a/src/ElectronNET.API/API/Notification.cs b/src/ElectronNET.API/API/Notification.cs
index aaa0c479..fe17bf94 100644
--- a/src/ElectronNET.API/API/Notification.cs
+++ b/src/ElectronNET.API/API/Notification.cs
@@ -116,6 +116,6 @@ private static void GenerateIDsForDefinedActions(NotificationOptions notificatio
         /// Whether or not desktop notifications are supported on the current system.
         /// </summary>
         /// <returns></returns>
-        public Task<bool> IsSupportedAsync() => GetPropertyAsync<bool>();
+        public Task<bool> IsSupportedAsync() => this.InvokeAsync<bool>();
     }
 }
diff --git a/src/ElectronNET.API/API/Process.cs b/src/ElectronNET.API/API/Process.cs
index 328b0074..3edf1b56 100644
--- a/src/ElectronNET.API/API/Process.cs
+++ b/src/ElectronNET.API/API/Process.cs
@@ -44,7 +44,7 @@ internal static Process Instance
         /// The process.execPath property returns the absolute pathname of the executable that
         /// started the Node.js process. Symbolic links, if any, are resolved.
         /// </summary> 
-        public Task<string> ExecPathAsync => GetPropertyAsync<string>();
+        public Task<string> ExecPathAsync => this.InvokeAsync<string>();
 
         /// <summary>
         /// The process.argv property returns an array containing the command-line arguments passed
@@ -53,56 +53,56 @@ internal static Process Instance
         /// will be the path to the JavaScript file being executed. The remaining elements will be
         /// any additional command-line arguments
         /// </summary>
-        public Task<string[]> ArgvAsync => GetPropertyAsync<string[]>();
+        public Task<string[]> ArgvAsync => this.InvokeAsync<string[]>();
 
         /// <summary>
         /// The process.execPath property returns the absolute pathname of the executable that
         /// started the Node.js process. Symbolic links, if any, are resolved.
         /// </summary>
-        public Task<string> TypeAsync => GetPropertyAsync<string>();
+        public Task<string> TypeAsync => this.InvokeAsync<string>();
 
         /// <summary>
         /// The process.versions property returns an object listing the version strings of
         /// chrome and electron.
         /// </summary> 
-        public Task<ProcessVersions> VersionsAsync => GetPropertyAsync<ProcessVersions>();
+        public Task<ProcessVersions> VersionsAsync => this.InvokeAsync<ProcessVersions>();
 
         /// <summary>
         /// A Boolean. When app is started by being passed as parameter to the default app, this
         /// property is true in the main process, otherwise it is false.
         /// </summary>
-        public Task<bool> DefaultAppAsync => GetPropertyAsync<bool>();
+        public Task<bool> DefaultAppAsync => this.InvokeAsync<bool>();
 
         /// <summary>
         /// A Boolean, true when the current renderer context is the "main" renderer frame. If you
         /// want the ID of the current frame you should use webFrame.routingId
         /// </summary>
-        public Task<bool> IsMainFrameAsync => GetPropertyAsync<bool>();
+        public Task<bool> IsMainFrameAsync => this.InvokeAsync<bool>();
 
         /// <summary>
         /// A String representing the path to the resources directory.
         /// </summary>
-        public Task<string> ResourcesPathAsync => GetPropertyAsync<string>();
+        public Task<string> ResourcesPathAsync => this.InvokeAsync<string>();
 
         /// <summary>
         /// The number of seconds the current Node.js process has been running. The return value
         /// includes fractions of a second. Use Math.floor() to get whole seconds.
         /// </summary>
-        public Task<double> UpTimeAsync => GetPropertyAsync<double>();
+        public Task<double> UpTimeAsync => this.InvokeAsync<double>();
 
         /// <summary>
         /// The PID of the electron process
         /// </summary>
-        public Task<int> PidAsync => GetPropertyAsync<int>();
+        public Task<int> PidAsync => this.InvokeAsync<int>();
 
         /// <summary>
         /// The operating system CPU architecture for which the Node.js binary was compiled
         /// </summary>
-        public Task<string> ArchAsync => GetPropertyAsync<string>();
+        public Task<string> ArchAsync => this.InvokeAsync<string>();
 
         /// <summary>
         /// A string identifying the operating system platform on which the Node.js process is running
         /// </summary>
-        public Task<string> PlatformAsync => GetPropertyAsync<string>();
+        public Task<string> PlatformAsync => this.InvokeAsync<string>();
     }
 }
diff --git a/src/ElectronNET.API/API/Screen.cs b/src/ElectronNET.API/API/Screen.cs
index 8c2b5cb0..17bf13f0 100644
--- a/src/ElectronNET.API/API/Screen.cs
+++ b/src/ElectronNET.API/API/Screen.cs
@@ -101,37 +101,37 @@ internal static Screen Instance
         /// The current absolute position of the mouse pointer.
         /// </summary>
         /// <returns></returns>
-        public Task<Point> GetCursorScreenPointAsync() => GetPropertyAsync<Point>();
+        public Task<Point> GetCursorScreenPointAsync() => this.InvokeAsync<Point>();
 
         /// <summary>
         /// macOS: The height of the menu bar in pixels.
         /// </summary>
         /// <returns>The height of the menu bar in pixels.</returns>
-        public Task<Rectangle> GetMenuBarWorkAreaAsync() => GetPropertyAsync<Rectangle>();
+        public Task<Rectangle> GetMenuBarWorkAreaAsync() => this.InvokeAsync<Rectangle>();
 
         /// <summary>
         /// The primary display.
         /// </summary>
         /// <returns></returns>
-        public Task<Display> GetPrimaryDisplayAsync() => GetPropertyAsync<Display>();
+        public Task<Display> GetPrimaryDisplayAsync() => this.InvokeAsync<Display>();
 
         /// <summary>
         /// An array of displays that are currently available.
         /// </summary>
         /// <returns>An array of displays that are currently available.</returns>
-        public Task<Display[]> GetAllDisplaysAsync() => GetPropertyAsync<Display[]>();
+        public Task<Display[]> GetAllDisplaysAsync() => this.InvokeAsync<Display[]>();
 
         /// <summary>
         /// The display nearest the specified point.
         /// </summary>
         /// <returns>The display nearest the specified point.</returns>
-        public Task<Display> GetDisplayNearestPointAsync(Point point) => GetPropertyAsync<Display>(point);
+        public Task<Display> GetDisplayNearestPointAsync(Point point) => this.InvokeAsync<Display>(point);
 
         /// <summary>
         /// The display that most closely intersects the provided bounds.
         /// </summary>
         /// <param name="rectangle"></param>
         /// <returns>The display that most closely intersects the provided bounds.</returns>
-        public Task<Display> GetDisplayMatchingAsync(Rectangle rectangle) => GetPropertyAsync<Display>(rectangle);
+        public Task<Display> GetDisplayMatchingAsync(Rectangle rectangle) => this.InvokeAsync<Display>(rectangle);
     }
 }
diff --git a/src/ElectronNET.API/API/WebContents.cs b/src/ElectronNET.API/API/WebContents.cs
index 761bfed4..5c598d2f 100644
--- a/src/ElectronNET.API/API/WebContents.cs
+++ b/src/ElectronNET.API/API/WebContents.cs
@@ -139,19 +139,19 @@ public void OpenDevTools(OpenDevToolsOptions openDevToolsOptions)
     /// Get system printers.
     /// </summary>
     /// <returns>printers</returns>
-    public Task<PrinterInfo[]> GetPrintersAsync() => GetPropertyAsync<PrinterInfo[]>();
+    public Task<PrinterInfo[]> GetPrintersAsync() => this.InvokeAsync<PrinterInfo[]>();
 
     /// <summary>
     /// Prints window's web page.
     /// </summary>
     /// <param name="options"></param>
     /// <returns>success</returns>
-    public Task<bool> PrintAsync(PrintOptions options) => GetPropertyAsync<bool>(options);
+    public Task<bool> PrintAsync(PrintOptions options) => this.InvokeAsync<bool>(options);
     /// <summary>
     /// Prints window's web page.
     /// </summary>
     /// <returns>success</returns>
-    public Task<bool> PrintAsync() => GetPropertyAsync<bool>(string.Empty);
+    public Task<bool> PrintAsync() => this.InvokeAsync<bool>(string.Empty);
 
     /// <summary>
     /// Prints window's web page as PDF with Chromium's preview printing custom