diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseAdminStatsClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseAdminStatsClient.cs
index 1ae1f61682..0de02bff46 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseAdminStatsClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseAdminStatsClient.cs
@@ -15,7 +15,7 @@ public class ObservableEnterpriseAdminStatsClient : IObservableEnterpriseAdminSt
 
         public ObservableEnterpriseAdminStatsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Enterprise.AdminStats;
         }
diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseClient.cs
index a463212a72..25ba9c2263 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseClient.cs
@@ -10,7 +10,7 @@ public class ObservableEnterpriseClient : IObservableEnterpriseClient
     {
         public ObservableEnterpriseClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             AdminStats = new ObservableEnterpriseAdminStatsClient(client);
             Ldap = new ObservableEnterpriseLdapClient(client);
diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLdapClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLdapClient.cs
index d8ed988345..b6fb718455 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLdapClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLdapClient.cs
@@ -17,7 +17,7 @@ public class ObservableEnterpriseLdapClient : IObservableEnterpriseLdapClient
 
         public ObservableEnterpriseLdapClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Enterprise.Ldap;
         }
diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLicenseClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLicenseClient.cs
index 3fbe664448..d3ca1e8e1b 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLicenseClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseLicenseClient.cs
@@ -16,7 +16,7 @@ public class ObservableEnterpriseLicenseClient : IObservableEnterpriseLicenseCli
 
         public ObservableEnterpriseLicenseClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Enterprise.License;
         }
diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseOrganizationClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseOrganizationClient.cs
index bf064920d6..6beaf279de 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseOrganizationClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseOrganizationClient.cs
@@ -16,7 +16,7 @@ public class ObservableEnterpriseOrganizationClient : IObservableEnterpriseOrgan
 
         public ObservableEnterpriseOrganizationClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Enterprise.Organization;
         }
diff --git a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseSearchIndexingClient.cs b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseSearchIndexingClient.cs
index feb093db73..974f66638b 100644
--- a/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseSearchIndexingClient.cs
+++ b/Octokit.Reactive/Clients/Enterprise/ObservableEnterpriseSearchIndexingClient.cs
@@ -16,7 +16,7 @@ public class ObservableEnterpriseSearchIndexingClient : IObservableEnterpriseSea
 
         public ObservableEnterpriseSearchIndexingClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Enterprise.SearchIndexing;
         }
diff --git a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
index bf5213544e..edef1eed53 100644
--- a/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableActivitiesClient.cs
@@ -4,7 +4,7 @@ public class ObservableActivitiesClient : IObservableActivitiesClient
     {
         public ObservableActivitiesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             Events = new ObservableEventsClient(client);
             Watching = new ObservableWatchedClient(client);
diff --git a/Octokit.Reactive/Clients/ObservableAssigneesClient.cs b/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
index eb242d635b..39c45f29ad 100644
--- a/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableAssigneesClient.cs
@@ -17,7 +17,7 @@ public class ObservableAssigneesClient : IObservableAssigneesClient
 
         public ObservableAssigneesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Issue.Assignee;
             _connection = client.Connection;
@@ -30,8 +30,8 @@ public ObservableAssigneesClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<User> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -53,9 +53,9 @@ public IObservable<User> GetAllForRepository(long repositoryId)
         /// <param name="options">The options to change API's behaviour.</param>
         public IObservable<User> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Assignees(owner, name), options);
         }
@@ -67,7 +67,7 @@ public IObservable<User> GetAllForRepository(string owner, string name, ApiOptio
         /// <param name="options">The options to change API's behaviour.</param>
         public IObservable<User> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Assignees(repositoryId), options);
         }
@@ -80,9 +80,9 @@ public IObservable<User> GetAllForRepository(long repositoryId, ApiOptions optio
         /// <param name="assignee">Username of the prospective assignee</param>
         public IObservable<bool> CheckAssignee(string owner, string name, string assignee)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(assignee, "assignee");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(assignee, nameof(assignee));
 
             return _client.CheckAssignee(owner, name, assignee).ToObservable();
         }
@@ -96,9 +96,9 @@ public IObservable<bool> CheckAssignee(string owner, string name, string assigne
         /// <param name="assignees">List of names of assignees to add</param>
         public IObservable<Issue> AddAssignees(string owner, string name, int number, AssigneesUpdate assignees)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(assignees, "assignees");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(assignees, nameof(assignees));
 
             return _client.AddAssignees(owner, name, number, assignees).ToObservable();
         }
@@ -113,9 +113,9 @@ public IObservable<Issue> AddAssignees(string owner, string name, int number, As
         /// <returns></returns>
         public IObservable<Issue> RemoveAssignees(string owner, string name, int number, AssigneesUpdate assignees)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(assignees, "assignees");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(assignees, nameof(assignees));
 
             return _client.RemoveAssignees(owner, name, number, assignees).ToObservable();
         }
@@ -127,7 +127,7 @@ public IObservable<Issue> RemoveAssignees(string owner, string name, int number,
         /// <param name="assignee">Username of the prospective assignee</param>
         public IObservable<bool> CheckAssignee(long repositoryId, string assignee)
         {
-            Ensure.ArgumentNotNullOrEmptyString(assignee, "assignee");
+            Ensure.ArgumentNotNullOrEmptyString(assignee, nameof(assignee));
 
             return _client.CheckAssignee(repositoryId, assignee).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs b/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
index e63ac304c7..7da86509db 100644
--- a/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableAuthorizationsClient.cs
@@ -12,7 +12,7 @@ public class ObservableAuthorizationsClient : IObservableAuthorizationsClient
 
         public ObservableAuthorizationsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Authorization;
             _connection = client.Connection;
@@ -42,7 +42,7 @@ public IObservable<Authorization> GetAll()
         /// <returns>A list of <see cref="Authorization"/>s for the authenticated user.</returns>
         public IObservable<Authorization> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Authorization>(ApiUrls.Authorizations(), options);
         }
@@ -79,7 +79,7 @@ public IObservable<Authorization> Get(int id)
         /// <returns>The created <see cref="Authorization"/>.</returns>
         public IObservable<ApplicationAuthorization> Create(NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             return _client.Create(newAuthorization).ToObservable();
         }
@@ -105,8 +105,8 @@ public IObservable<ApplicationAuthorization> Create(
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             return _client.Create(newAuthorization, twoFactorAuthenticationCode).ToObservable();
         }
@@ -135,9 +135,9 @@ public IObservable<ApplicationAuthorization> Create(
             string clientSecret,
             NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             return _client.Create(clientId, clientSecret, newAuthorization).ToObservable();
         }
@@ -168,10 +168,10 @@ public IObservable<ApplicationAuthorization> Create(
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             return _client.Create(clientId, clientSecret, newAuthorization, twoFactorAuthenticationCode).ToObservable();
         }
@@ -198,9 +198,9 @@ public IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthenticatio
             string clientSecret,
             NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             return _client.GetOrCreateApplicationAuthentication(clientId, clientSecret, newAuthorization)
                 .ToObservable();
@@ -230,10 +230,10 @@ public IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthenticatio
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             return _client.GetOrCreateApplicationAuthentication(
                 clientId,
@@ -309,7 +309,7 @@ public IObservable<Unit> RevokeApplicationAuthentication(string clientId, string
         /// <returns></returns>
         public IObservable<Authorization> Update(int id, AuthorizationUpdate authorizationUpdate)
         {
-            Ensure.ArgumentNotNull(authorizationUpdate, "authorizationUpdate");
+            Ensure.ArgumentNotNull(authorizationUpdate, nameof(authorizationUpdate));
 
             return _client.Update(id, authorizationUpdate).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableBlobClient.cs b/Octokit.Reactive/Clients/ObservableBlobClient.cs
index e2ebac25d3..8c52e2555b 100644
--- a/Octokit.Reactive/Clients/ObservableBlobClient.cs
+++ b/Octokit.Reactive/Clients/ObservableBlobClient.cs
@@ -15,7 +15,7 @@ public class ObservableBlobClient : IObservableBlobsClient
 
         public ObservableBlobClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Git.Blob;
         }
@@ -31,9 +31,9 @@ public ObservableBlobClient(IGitHubClient client)
         /// <param name="reference">The SHA of the blob</param>
         public IObservable<Blob> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(owner, name, reference).ToObservable();
         }
@@ -48,7 +48,7 @@ public IObservable<Blob> Get(string owner, string name, string reference)
         /// <param name="reference">The SHA of the blob</param>
         public IObservable<Blob> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(repositoryId, reference).ToObservable();
         }
@@ -64,9 +64,9 @@ public IObservable<Blob> Get(long repositoryId, string reference)
         /// <param name="newBlob">The new Blob</param>
         public IObservable<BlobReference> Create(string owner, string name, NewBlob newBlob)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newBlob, "newBlob");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newBlob, nameof(newBlob));
 
             return _client.Create(owner, name, newBlob).ToObservable();
         }
@@ -81,7 +81,7 @@ public IObservable<BlobReference> Create(string owner, string name, NewBlob newB
         /// <param name="newBlob">The new Blob</param>
         public IObservable<BlobReference> Create(long repositoryId, NewBlob newBlob)
         {
-            Ensure.ArgumentNotNull(newBlob, "newBlob");
+            Ensure.ArgumentNotNull(newBlob, nameof(newBlob));
 
             return _client.Create(repositoryId, newBlob).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableCommitCommentReactionsClient.cs b/Octokit.Reactive/Clients/ObservableCommitCommentReactionsClient.cs
index 5c7e965c4d..c17c50057c 100644
--- a/Octokit.Reactive/Clients/ObservableCommitCommentReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableCommitCommentReactionsClient.cs
@@ -17,7 +17,7 @@ public class ObservableCommitCommentReactionsClient : IObservableCommitCommentRe
 
         public ObservableCommitCommentReactionsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Reaction.CommitComment;
             _connection = client.Connection;
@@ -34,9 +34,9 @@ public ObservableCommitCommentReactionsClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(owner, name, number, reaction).ToObservable();
         }
@@ -51,7 +51,7 @@ public IObservable<Reaction> Create(string owner, string name, int number, NewRe
         /// <returns></returns>
         public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(repositoryId, number, reaction).ToObservable();
         }
@@ -66,8 +66,8 @@ public IObservable<Reaction> Create(long repositoryId, int number, NewReaction r
         /// <returns></returns>
         public IObservable<Reaction> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.CommitCommentReactions(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit.Reactive/Clients/ObservableCommitStatusClient.cs b/Octokit.Reactive/Clients/ObservableCommitStatusClient.cs
index 8cf0fc04d4..a8a4784abc 100644
--- a/Octokit.Reactive/Clients/ObservableCommitStatusClient.cs
+++ b/Octokit.Reactive/Clients/ObservableCommitStatusClient.cs
@@ -17,7 +17,7 @@ public class ObservableCommitStatusClient : IObservableCommitStatusClient
 
         public ObservableCommitStatusClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Status;
             _connection = client.Connection;
@@ -33,9 +33,9 @@ public ObservableCommitStatusClient(IGitHubClient client)
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public IObservable<CommitStatus> GetAll(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return GetAll(owner, name, reference, ApiOptions.None);
         }
@@ -49,7 +49,7 @@ public IObservable<CommitStatus> GetAll(string owner, string name, string refere
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public IObservable<CommitStatus> GetAll(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return GetAll(repositoryId, reference, ApiOptions.None);
         }
@@ -65,10 +65,10 @@ public IObservable<CommitStatus> GetAll(long repositoryId, string reference)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<CommitStatus> GetAll(string owner, string name, string reference, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitStatus>(ApiUrls.CommitStatuses(owner, name, reference), options);
         }
@@ -83,8 +83,8 @@ public IObservable<CommitStatus> GetAll(string owner, string name, string refere
         /// <param name="options">Options for changing the API response</param>
         public IObservable<CommitStatus> GetAll(long repositoryId, string reference, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitStatus>(ApiUrls.CommitStatuses(repositoryId, reference), options);
         }
@@ -99,9 +99,9 @@ public IObservable<CommitStatus> GetAll(long repositoryId, string reference, Api
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public IObservable<CombinedCommitStatus> GetCombined(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.GetCombined(owner, name, reference).ToObservable();
         }
@@ -115,7 +115,7 @@ public IObservable<CombinedCommitStatus> GetCombined(string owner, string name,
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public IObservable<CombinedCommitStatus> GetCombined(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.GetCombined(repositoryId, reference).ToObservable();
         }
@@ -129,10 +129,10 @@ public IObservable<CombinedCommitStatus> GetCombined(long repositoryId, string r
         /// <param name="newCommitStatus">The commit status to create</param>
         public IObservable<CommitStatus> Create(string owner, string name, string reference, NewCommitStatus newCommitStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(newCommitStatus, "newCommitStatus");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(newCommitStatus, nameof(newCommitStatus));
 
             return _client.Create(owner, name, reference, newCommitStatus).ToObservable();
         }
@@ -145,8 +145,8 @@ public IObservable<CommitStatus> Create(string owner, string name, string refere
         /// <param name="newCommitStatus">The commit status to create</param>
         public IObservable<CommitStatus> Create(long repositoryId, string reference, NewCommitStatus newCommitStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(newCommitStatus, "newCommitStatus");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(newCommitStatus, nameof(newCommitStatus));
 
             return _client.Create(repositoryId, reference, newCommitStatus).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableCommitsClient.cs b/Octokit.Reactive/Clients/ObservableCommitsClient.cs
index ff7bfc8573..2fb1e232cc 100644
--- a/Octokit.Reactive/Clients/ObservableCommitsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableCommitsClient.cs
@@ -15,7 +15,7 @@ public class ObservableCommitsClient : IObservableCommitsClient
 
         public ObservableCommitsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Git.Commit;
         }
@@ -31,9 +31,9 @@ public ObservableCommitsClient(IGitHubClient client)
         /// <param name="reference">Tha sha reference of the commit</param>
         public IObservable<Commit> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(owner, name, reference).ToObservable();
         }
@@ -48,7 +48,7 @@ public IObservable<Commit> Get(string owner, string name, string reference)
         /// <param name="reference">Tha sha reference of the commit</param>
         public IObservable<Commit> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(repositoryId, reference).ToObservable();
         }
@@ -64,9 +64,9 @@ public IObservable<Commit> Get(long repositoryId, string reference)
         /// <param name="commit">The commit to create</param>
         public IObservable<Commit> Create(string owner, string name, NewCommit commit)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commit, "commit");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commit, nameof(commit));
 
             return _client.Create(owner, name, commit).ToObservable();
         }
@@ -81,7 +81,7 @@ public IObservable<Commit> Create(string owner, string name, NewCommit commit)
         /// <param name="commit">The commit to create</param>
         public IObservable<Commit> Create(long repositoryId, NewCommit commit)
         {
-            Ensure.ArgumentNotNull(commit, "commit");
+            Ensure.ArgumentNotNull(commit, nameof(commit));
 
             return _client.Create(repositoryId, commit).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs b/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs
index 964fa8db7b..e9ec0425ff 100644
--- a/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs
+++ b/Octokit.Reactive/Clients/ObservableDeploymentStatusClient.cs
@@ -18,7 +18,7 @@ public class ObservableDeploymentStatusClient : IObservableDeploymentStatusClien
 
         public ObservableDeploymentStatusClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Deployment.Status;
             _connection = client.Connection;
@@ -36,8 +36,8 @@ public ObservableDeploymentStatusClient(IGitHubClient client)
         /// <param name="deploymentId">The id of the deployment.</param>
         public IObservable<DeploymentStatus> GetAll(string owner, string name, int deploymentId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, deploymentId, ApiOptions.None);
         }
@@ -69,9 +69,9 @@ public IObservable<DeploymentStatus> GetAll(long repositoryId, int deploymentId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<DeploymentStatus> GetAll(string owner, string name, int deploymentId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<DeploymentStatus>(
                 ApiUrls.DeploymentStatuses(owner, name, deploymentId), options);
@@ -89,7 +89,7 @@ public IObservable<DeploymentStatus> GetAll(string owner, string name, int deplo
         /// <param name="options">Options for changing the API response</param>
         public IObservable<DeploymentStatus> GetAll(long repositoryId, int deploymentId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<DeploymentStatus>(
                 ApiUrls.DeploymentStatuses(repositoryId, deploymentId), options);
@@ -108,9 +108,9 @@ public IObservable<DeploymentStatus> GetAll(long repositoryId, int deploymentId,
         /// <param name="newDeploymentStatus">The new deployment status to create.</param>
         public IObservable<DeploymentStatus> Create(string owner, string name, int deploymentId, NewDeploymentStatus newDeploymentStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newDeploymentStatus, "newDeploymentStatus");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newDeploymentStatus, nameof(newDeploymentStatus));
 
             return _client.Create(owner, name, deploymentId, newDeploymentStatus).ToObservable();
         }
@@ -127,7 +127,7 @@ public IObservable<DeploymentStatus> Create(string owner, string name, int deplo
         /// <param name="newDeploymentStatus">The new deployment status to create.</param>
         public IObservable<DeploymentStatus> Create(long repositoryId, int deploymentId, NewDeploymentStatus newDeploymentStatus)
         {
-            Ensure.ArgumentNotNull(newDeploymentStatus, "newDeploymentStatus");
+            Ensure.ArgumentNotNull(newDeploymentStatus, nameof(newDeploymentStatus));
 
             return _client.Create(repositoryId, deploymentId, newDeploymentStatus).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs b/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs
index a0f0686805..3ba4fcf986 100644
--- a/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableDeploymentsClient.cs
@@ -18,7 +18,7 @@ public class ObservableDeploymentsClient : IObservableDeploymentsClient
 
         public ObservableDeploymentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Deployment;
             _connection = client.Connection;
@@ -37,8 +37,8 @@ public ObservableDeploymentsClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<Deployment> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -68,9 +68,9 @@ public IObservable<Deployment> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Deployment> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Deployment>(
                 ApiUrls.Deployments(owner, name), options);
@@ -87,7 +87,7 @@ public IObservable<Deployment> GetAll(string owner, string name, ApiOptions opti
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Deployment> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Deployment>(
                 ApiUrls.Deployments(repositoryId), options);
@@ -105,7 +105,7 @@ public IObservable<Deployment> GetAll(long repositoryId, ApiOptions options)
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
         public IObservable<Deployment> Create(string owner, string name, NewDeployment newDeployment)
         {
-            Ensure.ArgumentNotNull(newDeployment, "newDeployment");
+            Ensure.ArgumentNotNull(newDeployment, nameof(newDeployment));
 
             return _client.Create(owner, name, newDeployment).ToObservable();
         }
@@ -121,7 +121,7 @@ public IObservable<Deployment> Create(string owner, string name, NewDeployment n
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
         public IObservable<Deployment> Create(long repositoryId, NewDeployment newDeployment)
         {
-            Ensure.ArgumentNotNull(newDeployment, "newDeployment");
+            Ensure.ArgumentNotNull(newDeployment, nameof(newDeployment));
 
             return _client.Create(repositoryId, newDeployment).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableEventsClient.cs b/Octokit.Reactive/Clients/ObservableEventsClient.cs
index 666fc8c1d1..1f6f436b62 100644
--- a/Octokit.Reactive/Clients/ObservableEventsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableEventsClient.cs
@@ -15,7 +15,7 @@ public class ObservableEventsClient : IObservableEventsClient
 
         public ObservableEventsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _connection = client.Connection;
         }
@@ -40,7 +40,7 @@ public IObservable<Activity> GetAll()
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.Events(), options);
         }
@@ -55,8 +55,8 @@ public IObservable<Activity> GetAll(ApiOptions options)
         /// <param name="name">The name of the repository</param>
         public IObservable<Activity> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -84,9 +84,9 @@ public IObservable<Activity> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.Events(owner, name), options);
         }
@@ -101,7 +101,7 @@ public IObservable<Activity> GetAllForRepository(string owner, string name, ApiO
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.Events(repositoryId), options);
         }
@@ -116,8 +116,8 @@ public IObservable<Activity> GetAllForRepository(long repositoryId, ApiOptions o
         /// <param name="name">The name of the repository</param>
         public IObservable<IssueEvent> GetAllIssuesForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllIssuesForRepository(owner, name, ApiOptions.None);
         }
@@ -145,9 +145,9 @@ public IObservable<IssueEvent> GetAllIssuesForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueEvent> GetAllIssuesForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueEvent>(ApiUrls.IssuesEvents(owner, name), options);
         }
@@ -162,7 +162,7 @@ public IObservable<IssueEvent> GetAllIssuesForRepository(string owner, string na
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueEvent> GetAllIssuesForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueEvent>(ApiUrls.IssuesEvents(repositoryId), options);
         }
@@ -177,8 +177,8 @@ public IObservable<IssueEvent> GetAllIssuesForRepository(long repositoryId, ApiO
         /// <param name="name">The name of the repository</param>
         public IObservable<Activity> GetAllForRepositoryNetwork(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepositoryNetwork(owner, name, ApiOptions.None);
         }
@@ -194,9 +194,9 @@ public IObservable<Activity> GetAllForRepositoryNetwork(string owner, string nam
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllForRepositoryNetwork(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.NetworkEvents(owner, name), options);
         }
@@ -210,7 +210,7 @@ public IObservable<Activity> GetAllForRepositoryNetwork(string owner, string nam
         /// <param name="organization">The name of the organization</param>
         public IObservable<Activity> GetAllForOrganization(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrganization(organization, ApiOptions.None);
         }
@@ -225,8 +225,8 @@ public IObservable<Activity> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.OrganizationEvents(organization), options);
         }
@@ -240,7 +240,7 @@ public IObservable<Activity> GetAllForOrganization(string organization, ApiOptio
         /// <param name="user">The login of the user</param>
         public IObservable<Activity> GetAllUserReceived(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserReceived(user, ApiOptions.None);
         }
@@ -255,8 +255,8 @@ public IObservable<Activity> GetAllUserReceived(string user)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllUserReceived(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.ReceivedEvents(user), options);
         }
@@ -270,7 +270,7 @@ public IObservable<Activity> GetAllUserReceived(string user, ApiOptions options)
         /// <param name="user">The login of the user</param>
         public IObservable<Activity> GetAllUserReceivedPublic(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserReceivedPublic(user, ApiOptions.None);
         }
@@ -285,8 +285,8 @@ public IObservable<Activity> GetAllUserReceivedPublic(string user)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllUserReceivedPublic(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.ReceivedEvents(user, true), options);
         }
@@ -300,7 +300,7 @@ public IObservable<Activity> GetAllUserReceivedPublic(string user, ApiOptions op
         /// <param name="user">The login of the user</param>
         public IObservable<Activity> GetAllUserPerformed(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserPerformed(user, ApiOptions.None);
         }
@@ -315,8 +315,8 @@ public IObservable<Activity> GetAllUserPerformed(string user)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllUserPerformed(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.PerformedEvents(user), options);
         }
@@ -330,7 +330,7 @@ public IObservable<Activity> GetAllUserPerformed(string user, ApiOptions options
         /// <param name="user">The login of the user</param>
         public IObservable<Activity> GetAllUserPerformedPublic(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserPerformedPublic(user, ApiOptions.None);
         }
@@ -345,8 +345,8 @@ public IObservable<Activity> GetAllUserPerformedPublic(string user)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllUserPerformedPublic(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.PerformedEvents(user, true), options);
         }
@@ -361,8 +361,8 @@ public IObservable<Activity> GetAllUserPerformedPublic(string user, ApiOptions o
         /// <param name="organization">The name of the organization</param>
         public IObservable<Activity> GetAllForAnOrganization(string user, string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForAnOrganization(user, organization, ApiOptions.None);
         }
@@ -378,9 +378,9 @@ public IObservable<Activity> GetAllForAnOrganization(string user, string organiz
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Activity> GetAllForAnOrganization(string user, string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Activity>(ApiUrls.OrganizationEvents(user, organization), options);
         }
diff --git a/Octokit.Reactive/Clients/ObservableFeedsClient.cs b/Octokit.Reactive/Clients/ObservableFeedsClient.cs
index 12f2f16667..1bea312fdb 100644
--- a/Octokit.Reactive/Clients/ObservableFeedsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableFeedsClient.cs
@@ -15,7 +15,7 @@ public class ObservableFeedsClient : IObservableFeedsClient
 
         public ObservableFeedsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Activity.Feeds;
         }
diff --git a/Octokit.Reactive/Clients/ObservableFollowersClient.cs b/Octokit.Reactive/Clients/ObservableFollowersClient.cs
index 955b530927..b321c4f743 100644
--- a/Octokit.Reactive/Clients/ObservableFollowersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableFollowersClient.cs
@@ -16,7 +16,7 @@ public class ObservableFollowersClient : IObservableFollowersClient
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
         public ObservableFollowersClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User.Followers;
             _connection = client.Connection;
@@ -44,7 +44,7 @@ public IObservable<User> GetAllForCurrent()
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that follow the authenticated user.</returns>
         public IObservable<User> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Followers(), options);
         }
@@ -59,7 +59,7 @@ public IObservable<User> GetAllForCurrent(ApiOptions options)
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that follow the passed user.</returns>
         public IObservable<User> GetAll(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAll(login, ApiOptions.None);
         }
@@ -75,8 +75,8 @@ public IObservable<User> GetAll(string login)
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that follow the passed user.</returns>
         public IObservable<User> GetAll(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Followers(login), options);
         }
@@ -103,7 +103,7 @@ public IObservable<User> GetAllFollowingForCurrent()
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that the authenticated user follows.</returns>
         public IObservable<User> GetAllFollowingForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Following(), options);
         }
@@ -118,7 +118,7 @@ public IObservable<User> GetAllFollowingForCurrent(ApiOptions options)
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that the passed user follows.</returns>
         public IObservable<User> GetAllFollowing(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAllFollowing(login, ApiOptions.None);
         }
@@ -134,8 +134,8 @@ public IObservable<User> GetAllFollowing(string login)
         /// <returns>A <see cref="IObservable{User}"/> of <see cref="User"/>s that the passed user follows.</returns>
         public IObservable<User> GetAllFollowing(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Following(login), options);
         }
@@ -150,7 +150,7 @@ public IObservable<User> GetAllFollowing(string login, ApiOptions options)
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public IObservable<bool> IsFollowingForCurrent(string following)
         {
-            Ensure.ArgumentNotNullOrEmptyString(following, "following");
+            Ensure.ArgumentNotNullOrEmptyString(following, nameof(following));
 
             return _client.IsFollowingForCurrent(following).ToObservable();
         }
@@ -166,8 +166,8 @@ public IObservable<bool> IsFollowingForCurrent(string following)
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public IObservable<bool> IsFollowing(string login, string following)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNullOrEmptyString(following, "following");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNullOrEmptyString(following, nameof(following));
 
             return _client.IsFollowing(login, following).ToObservable();
         }
@@ -182,7 +182,7 @@ public IObservable<bool> IsFollowing(string login, string following)
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public IObservable<bool> Follow(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.Follow(login).ToObservable();
         }
@@ -197,7 +197,7 @@ public IObservable<bool> Follow(string login)
         /// <returns></returns>
         public IObservable<Unit> Unfollow(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.Unfollow(login).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableGistCommentsClient.cs b/Octokit.Reactive/Clients/ObservableGistCommentsClient.cs
index 240dd6f3a8..ac16b247eb 100644
--- a/Octokit.Reactive/Clients/ObservableGistCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableGistCommentsClient.cs
@@ -12,7 +12,7 @@ public class ObservableGistCommentsClient : IObservableGistCommentsClient
 
         public ObservableGistCommentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Gist.Comment;
             _connection = client.Connection;
@@ -38,7 +38,7 @@ public IObservable<GistComment> Get(string gistId, int commentId)
         /// <returns>IObservable{GistComment}.</returns>
         public IObservable<GistComment> GetAllForGist(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(gistId, "gistId");
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
             return GetAllForGist(gistId, ApiOptions.None);
         }
@@ -52,8 +52,8 @@ public IObservable<GistComment> GetAllForGist(string gistId)
         /// <returns>IObservable{GistComment}.</returns>
         public IObservable<GistComment> GetAllForGist(string gistId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(gistId, "gistId");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<GistComment>(ApiUrls.GistComments(gistId), options);
         }
@@ -67,7 +67,7 @@ public IObservable<GistComment> GetAllForGist(string gistId, ApiOptions options)
         /// <returns>IObservable{GistComment}.</returns>
         public IObservable<GistComment> Create(string gistId, string comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
             return _client.Create(gistId, comment).ToObservable();
         }
@@ -82,7 +82,7 @@ public IObservable<GistComment> Create(string gistId, string comment)
         /// <returns>IObservable{GistComment}.</returns>
         public IObservable<GistComment> Update(string gistId, int commentId, string comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
             return _client.Update(gistId, commentId, comment).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableGistsClient.cs b/Octokit.Reactive/Clients/ObservableGistsClient.cs
index a76dd58d64..a97b0315c2 100644
--- a/Octokit.Reactive/Clients/ObservableGistsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableGistsClient.cs
@@ -12,7 +12,7 @@ public class ObservableGistsClient : IObservableGistsClient
 
         public ObservableGistsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Gist;
             _connection = client.Connection;
@@ -30,7 +30,7 @@ public ObservableGistsClient(IGitHubClient client)
         /// <param name="id">The id of the gist</param>
         public IObservable<Gist> Get(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return _client.Get(id).ToObservable();
         }
@@ -44,7 +44,7 @@ public IObservable<Gist> Get(string id)
         /// <param name="newGist">The new gist to create</param>
         public IObservable<Gist> Create(NewGist newGist)
         {
-            Ensure.ArgumentNotNull(newGist, "newGist");
+            Ensure.ArgumentNotNull(newGist, nameof(newGist));
 
             return _client.Create(newGist).ToObservable();
         }
@@ -70,7 +70,7 @@ public IObservable<Gist> Fork(string id)
         /// <param name="id">The id of the gist</param>
         public IObservable<Unit> Delete(string id)
         {
-            Ensure.ArgumentNotNull(id, "id");
+            Ensure.ArgumentNotNull(id, nameof(id));
 
             return _client.Delete(id).ToObservable();
         }
@@ -97,7 +97,7 @@ public IObservable<Gist> GetAll()
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.Gist(), options);
         }
@@ -126,7 +126,7 @@ public IObservable<Gist> GetAll(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAll(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.Gist(), request.ToParametersDictionary(), options);
@@ -152,7 +152,7 @@ public IObservable<Gist> GetAllPublic()
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllPublic(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.PublicGists(), options);
         }
@@ -179,7 +179,7 @@ public IObservable<Gist> GetAllPublic(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllPublic(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.PublicGists(), request.ToParametersDictionary(), options);
@@ -205,7 +205,7 @@ public IObservable<Gist> GetAllStarred()
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllStarred(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.StarredGists(), options);
         }
@@ -232,7 +232,7 @@ public IObservable<Gist> GetAllStarred(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllStarred(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.StarredGists(), request.ToParametersDictionary(), options);
@@ -247,7 +247,7 @@ public IObservable<Gist> GetAllStarred(DateTimeOffset since, ApiOptions options)
         /// <param name="user">The user</param>
         public IObservable<Gist> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -262,8 +262,8 @@ public IObservable<Gist> GetAllForUser(string user)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.UsersGists(user), options);
         }
@@ -278,7 +278,7 @@ public IObservable<Gist> GetAllForUser(string user, ApiOptions options)
         /// <param name="since">Only gists updated at or after this time are returned</param>
         public IObservable<Gist> GetAllForUser(string user, DateTimeOffset since)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, since, ApiOptions.None);
         }
@@ -294,8 +294,8 @@ public IObservable<Gist> GetAllForUser(string user, DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Gist> GetAllForUser(string user, DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return _connection.GetAndFlattenAllPages<Gist>(ApiUrls.UsersGists(user), request.ToParametersDictionary(), options);
@@ -310,7 +310,7 @@ public IObservable<Gist> GetAllForUser(string user, DateTimeOffset since, ApiOpt
         /// <param name="id">The id of the gist</param>
         public IObservable<GistHistory> GetAllCommits(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return GetAllCommits(id, ApiOptions.None);
         }
@@ -325,8 +325,8 @@ public IObservable<GistHistory> GetAllCommits(string id)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GistHistory> GetAllCommits(string id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<GistHistory>(ApiUrls.GistCommits(id), options);
         }
@@ -340,7 +340,7 @@ public IObservable<GistHistory> GetAllCommits(string id, ApiOptions options)
         /// <param name="id">The id of the gist</param>
         public IObservable<GistFork> GetAllForks(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return GetAllForks(id, ApiOptions.None);
         }
@@ -355,8 +355,8 @@ public IObservable<GistFork> GetAllForks(string id)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GistFork> GetAllForks(string id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<GistFork>(ApiUrls.ForkGist(id), options);
         }
@@ -371,8 +371,8 @@ public IObservable<GistFork> GetAllForks(string id, ApiOptions options)
         /// <param name="gistUpdate">The update to the gist</param>
         public IObservable<Gist> Edit(string id, GistUpdate gistUpdate)
         {
-            Ensure.ArgumentNotNull(id, "id");
-            Ensure.ArgumentNotNull(gistUpdate, "gistUpdate");
+            Ensure.ArgumentNotNull(id, nameof(id));
+            Ensure.ArgumentNotNull(gistUpdate, nameof(gistUpdate));
 
             return _client.Edit(id, gistUpdate).ToObservable();
         }
@@ -410,7 +410,7 @@ public IObservable<Unit> Unstar(string id)
         /// <param name="id">The id of the gist</param>
         public IObservable<bool> IsStarred(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return _client.IsStarred(id).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssueCommentReactionsClient.cs b/Octokit.Reactive/Clients/ObservableIssueCommentReactionsClient.cs
index 5b62302dc7..641e709047 100644
--- a/Octokit.Reactive/Clients/ObservableIssueCommentReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueCommentReactionsClient.cs
@@ -17,7 +17,7 @@ public class ObservableIssueCommentReactionsClient : IObservableIssueCommentReac
 
         public ObservableIssueCommentReactionsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Reaction.IssueComment;
             _connection = client.Connection;
@@ -33,9 +33,9 @@ public ObservableIssueCommentReactionsClient(IGitHubClient client)
         /// <param name="reaction">The reaction to create </param>
         public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(owner, name, number, reaction).ToObservable();
         }
@@ -49,7 +49,7 @@ public IObservable<Reaction> Create(string owner, string name, int number, NewRe
         /// <param name="reaction">The reaction to create </param>
         public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(repositoryId, number, reaction).ToObservable();
         }
@@ -63,8 +63,8 @@ public IObservable<Reaction> Create(long repositoryId, int number, NewReaction r
         /// <param name="number">The comment id</param>        
         public IObservable<Reaction> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueCommentReactions(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
index 7069091cd1..5b21cedad9 100644
--- a/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs
@@ -18,7 +18,7 @@ public class ObservableIssueCommentsClient : IObservableIssueCommentsClient
 
         public ObservableIssueCommentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Issue.Comment;
             _connection = client.Connection;
@@ -33,8 +33,8 @@ public ObservableIssueCommentsClient(IGitHubClient client)
         /// <param name="id">The issue comment id</param>
         public IObservable<IssueComment> Get(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, id).ToObservable();
         }
@@ -58,8 +58,8 @@ public IObservable<IssueComment> Get(long repositoryId, int id)
         /// <param name="name">The name of the repository</param>
         public IObservable<IssueComment> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -83,9 +83,9 @@ public IObservable<IssueComment> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new IssueCommentRequest(), options);
         }
@@ -98,7 +98,7 @@ public IObservable<IssueComment> GetAllForRepository(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new IssueCommentRequest(), options);
         }
@@ -112,9 +112,9 @@ public IObservable<IssueComment> GetAllForRepository(long repositoryId, ApiOptio
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         public IObservable<IssueComment> GetAllForRepository(string owner, string name, IssueCommentRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -127,7 +127,7 @@ public IObservable<IssueComment> GetAllForRepository(string owner, string name,
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         public IObservable<IssueComment> GetAllForRepository(long repositoryId, IssueCommentRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -142,10 +142,10 @@ public IObservable<IssueComment> GetAllForRepository(long repositoryId, IssueCom
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForRepository(string owner, string name, IssueCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -159,8 +159,8 @@ public IObservable<IssueComment> GetAllForRepository(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForRepository(long repositoryId, IssueCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -174,8 +174,8 @@ public IObservable<IssueComment> GetAllForRepository(long repositoryId, IssueCom
         /// <param name="number">The issue number</param>
         public IObservable<IssueComment> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -201,9 +201,9 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(owner, name, number), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -217,7 +217,7 @@ public IObservable<IssueComment> GetAllForIssue(string owner, string name, int n
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueComment> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueComment>(ApiUrls.IssueComments(repositoryId, number), options);
         }
@@ -232,9 +232,9 @@ public IObservable<IssueComment> GetAllForIssue(long repositoryId, int number, A
         /// <param name="newComment">The text of the new comment</param>
         public IObservable<IssueComment> Create(string owner, string name, int number, string newComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newComment, "newComment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
             return _client.Create(owner, name, number, newComment).ToObservable();
         }
@@ -248,7 +248,7 @@ public IObservable<IssueComment> Create(string owner, string name, int number, s
         /// <param name="newComment">The text of the new comment</param>
         public IObservable<IssueComment> Create(long repositoryId, int number, string newComment)
         {
-            Ensure.ArgumentNotNull(newComment, "newComment");
+            Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
             return _client.Create(repositoryId, number, newComment).ToObservable();
         }
@@ -263,9 +263,9 @@ public IObservable<IssueComment> Create(long repositoryId, int number, string ne
         /// <param name="commentUpdate">The modified comment</param>
         public IObservable<IssueComment> Update(string owner, string name, int id, string commentUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return _client.Update(owner, name, id, commentUpdate).ToObservable();
         }
@@ -279,7 +279,7 @@ public IObservable<IssueComment> Update(string owner, string name, int id, strin
         /// <param name="commentUpdate">The modified comment</param>
         public IObservable<IssueComment> Update(long repositoryId, int id, string commentUpdate)
         {
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return _client.Update(repositoryId, id, commentUpdate).ToObservable();
         }
@@ -293,8 +293,8 @@ public IObservable<IssueComment> Update(long repositoryId, int id, string commen
         /// <param name="id">The comment id</param>
         public IObservable<Unit> Delete(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, id).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs b/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
index 95c09df5bc..6d2a3b154b 100644
--- a/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs
@@ -17,7 +17,7 @@ public class ObservableIssueReactionsClient : IObservableIssueReactionsClient
 
         public ObservableIssueReactionsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Reaction.Issue;
             _connection = client.Connection;
@@ -32,8 +32,8 @@ public ObservableIssueReactionsClient(IGitHubClient client)
         /// <param name="number">The issue id</param>        
         public IObservable<Reaction> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueReactions(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
@@ -59,9 +59,9 @@ public IObservable<Reaction> GetAll(long repositoryId, int number)
         /// <param name="reaction">The reaction to create</param>
         public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(owner, name, number, reaction).ToObservable();
         }
@@ -75,7 +75,7 @@ public IObservable<Reaction> Create(string owner, string name, int number, NewRe
         /// <param name="reaction">The reaction to create </param>
         public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(repositoryId, number, reaction).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs b/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
index 365752a638..efc0970157 100644
--- a/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssueTimelineClient.cs
@@ -15,7 +15,7 @@ public class ObservableIssueTimelineClient : IObservableIssueTimelineClient
 
         public ObservableIssueTimelineClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _connection = client.Connection;
         }
@@ -31,8 +31,8 @@ public ObservableIssueTimelineClient(IGitHubClient client)
         /// <param name="number">The issue number</param>
         public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
 
             return GetAllForIssue(owner, repo, number, ApiOptions.None);
         }
@@ -49,9 +49,9 @@ public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo,
         /// <param name="options">Options for changing the API response</param>
         public IObservable<TimelineEventInfo> GetAllForIssue(string owner, string repo, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<TimelineEventInfo>(ApiUrls.IssueTimeline(owner, repo, number), null, AcceptHeaders.IssueTimelineApiPreview, options);
         }
@@ -80,7 +80,7 @@ public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int numb
         /// <param name="options">Options for changing the API response</param>
         public IObservable<TimelineEventInfo> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<TimelineEventInfo>(ApiUrls.IssueTimeline(repositoryId, number), null, AcceptHeaders.IssueTimelineApiPreview, options);
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssuesClient.cs b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
index 24b8b67ad5..fb38ed2134 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesClient.cs
@@ -50,7 +50,7 @@ public class ObservableIssuesClient : IObservableIssuesClient
 
         public ObservableIssuesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Issue;
             _connection = client.Connection;
@@ -73,8 +73,8 @@ public ObservableIssuesClient(IGitHubClient client)
         /// <param name="number">The issue number</param>
         public IObservable<Issue> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
@@ -116,7 +116,7 @@ public IObservable<Issue> GetAllForCurrent()
         /// </remarks>
         public IObservable<Issue> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForCurrent(new IssueRequest(), options);
         }
@@ -131,7 +131,7 @@ public IObservable<Issue> GetAllForCurrent(ApiOptions options)
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public IObservable<Issue> GetAllForCurrent(IssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -147,8 +147,8 @@ public IObservable<Issue> GetAllForCurrent(IssueRequest request)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForCurrent(IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.Issues(), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -177,7 +177,7 @@ public IObservable<Issue> GetAllForOwnedAndMemberRepositories()
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForOwnedAndMemberRepositories(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForOwnedAndMemberRepositories(new IssueRequest(), options);
         }
@@ -191,7 +191,7 @@ public IObservable<Issue> GetAllForOwnedAndMemberRepositories(ApiOptions options
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public IObservable<Issue> GetAllForOwnedAndMemberRepositories(IssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForOwnedAndMemberRepositories(request, ApiOptions.None);
         }
@@ -206,8 +206,8 @@ public IObservable<Issue> GetAllForOwnedAndMemberRepositories(IssueRequest reque
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForOwnedAndMemberRepositories(IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.IssuesForOwnedAndMember(), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -221,7 +221,7 @@ public IObservable<Issue> GetAllForOwnedAndMemberRepositories(IssueRequest reque
         /// <param name="organization">The name of the organization</param>
         public IObservable<Issue> GetAllForOrganization(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrganization(organization, ApiOptions.None);
         }
@@ -236,8 +236,8 @@ public IObservable<Issue> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForOrganization(organization, new IssueRequest(), options);
         }
@@ -252,8 +252,8 @@ public IObservable<Issue> GetAllForOrganization(string organization, ApiOptions
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public IObservable<Issue> GetAllForOrganization(string organization, IssueRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForOrganization(organization, request, ApiOptions.None);
         }
@@ -269,9 +269,9 @@ public IObservable<Issue> GetAllForOrganization(string organization, IssueReques
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForOrganization(string organization, IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.Issues(organization), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -286,8 +286,8 @@ public IObservable<Issue> GetAllForOrganization(string organization, IssueReques
         /// <param name="name">The name of the repository</param>
         public IObservable<Issue> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -315,9 +315,9 @@ public IObservable<Issue> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new RepositoryIssueRequest(), options);
         }
@@ -332,7 +332,7 @@ public IObservable<Issue> GetAllForRepository(string owner, string name, ApiOpti
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new RepositoryIssueRequest(), options);
         }
@@ -348,9 +348,9 @@ public IObservable<Issue> GetAllForRepository(long repositoryId, ApiOptions opti
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public IObservable<Issue> GetAllForRepository(string owner, string name, RepositoryIssueRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -365,7 +365,7 @@ public IObservable<Issue> GetAllForRepository(string owner, string name, Reposit
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public IObservable<Issue> GetAllForRepository(long repositoryId, RepositoryIssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -382,10 +382,10 @@ public IObservable<Issue> GetAllForRepository(long repositoryId, RepositoryIssue
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForRepository(string owner, string name, RepositoryIssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.Issues(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -401,8 +401,8 @@ public IObservable<Issue> GetAllForRepository(string owner, string name, Reposit
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Issue> GetAllForRepository(long repositoryId, RepositoryIssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Issue>(ApiUrls.Issues(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -417,9 +417,9 @@ public IObservable<Issue> GetAllForRepository(long repositoryId, RepositoryIssue
         /// <param name="newIssue">A <see cref="NewIssue"/> instance describing the new issue to create</param>
         public IObservable<Issue> Create(string owner, string name, NewIssue newIssue)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newIssue, "newIssue");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newIssue, nameof(newIssue));
 
             return _client.Create(owner, name, newIssue).ToObservable();
         }
@@ -433,7 +433,7 @@ public IObservable<Issue> Create(string owner, string name, NewIssue newIssue)
         /// <param name="newIssue">A <see cref="NewIssue"/> instance describing the new issue to create</param>
         public IObservable<Issue> Create(long repositoryId, NewIssue newIssue)
         {
-            Ensure.ArgumentNotNull(newIssue, "newIssue");
+            Ensure.ArgumentNotNull(newIssue, nameof(newIssue));
 
             return _client.Create(repositoryId, newIssue).ToObservable();
         }
@@ -450,9 +450,9 @@ public IObservable<Issue> Create(long repositoryId, NewIssue newIssue)
         /// </param>
         public IObservable<Issue> Update(string owner, string name, int number, IssueUpdate issueUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(issueUpdate, "issueUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
             return _client.Update(owner, name, number, issueUpdate).ToObservable();
         }
@@ -468,7 +468,7 @@ public IObservable<Issue> Update(string owner, string name, int number, IssueUpd
         /// </param>
         public IObservable<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate)
         {
-            Ensure.ArgumentNotNull(issueUpdate, "issueUpdate");
+            Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
             return _client.Update(repositoryId, number, issueUpdate).ToObservable();
         }
@@ -482,8 +482,8 @@ public IObservable<Issue> Update(long repositoryId, int number, IssueUpdate issu
         /// <param name="number">The issue number</param>
         public IObservable<Unit> Lock(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Lock(owner, name, number).ToObservable();
         }
@@ -508,8 +508,8 @@ public IObservable<Unit> Lock(long repositoryId, int number)
         /// <param name="number">The issue number</param>
         public IObservable<Unit> Unlock(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Unlock(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs b/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
index d1ea3e1e93..c435c15bb7 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesEventsClient.cs
@@ -17,7 +17,7 @@ public class ObservableIssuesEventsClient : IObservableIssuesEventsClient
 
         public ObservableIssuesEventsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Issue.Events;
             _connection = client.Connection;
@@ -34,8 +34,8 @@ public ObservableIssuesEventsClient(IGitHubClient client)
         /// <param name="number">The issue number</param>
         public IObservable<EventInfo> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -65,9 +65,9 @@ public IObservable<EventInfo> GetAllForIssue(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<EventInfo> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<EventInfo>(ApiUrls.IssuesEvents(owner, name, number), options);
         }
@@ -83,7 +83,7 @@ public IObservable<EventInfo> GetAllForIssue(string owner, string name, int numb
         /// <param name="options">Options for changing the API response</param>
         public IObservable<EventInfo> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<EventInfo>(ApiUrls.IssuesEvents(repositoryId, number), options);
         }
@@ -98,8 +98,8 @@ public IObservable<EventInfo> GetAllForIssue(long repositoryId, int number, ApiO
         /// <param name="name">The name of the repository</param>
         public IObservable<IssueEvent> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -127,9 +127,9 @@ public IObservable<IssueEvent> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueEvent> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueEvent>(ApiUrls.IssuesEvents(owner, name), options);
         }
@@ -144,7 +144,7 @@ public IObservable<IssueEvent> GetAllForRepository(string owner, string name, Ap
         /// <param name="options">Options for changing the API response</param>
         public IObservable<IssueEvent> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<IssueEvent>(ApiUrls.IssuesEvents(repositoryId), options);
         }
@@ -160,8 +160,8 @@ public IObservable<IssueEvent> GetAllForRepository(long repositoryId, ApiOptions
         /// <param name="number">The event id</param>
         public IObservable<IssueEvent> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs b/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
index 0d2c9162ba..ff23308b4c 100644
--- a/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableIssuesLabelsClient.cs
@@ -19,7 +19,7 @@ public class ObservableIssuesLabelsClient : IObservableIssuesLabelsClient
 
         public ObservableIssuesLabelsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _connection = client.Connection;
             _client = client.Issue.Labels;
@@ -36,8 +36,8 @@ public ObservableIssuesLabelsClient(IGitHubClient client)
         /// <param name="number">The number of the issue</param>
         public IObservable<Label> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -67,9 +67,9 @@ public IObservable<Label> GetAllForIssue(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.IssueLabels(owner, name, number), options);
         }
@@ -85,7 +85,7 @@ public IObservable<Label> GetAllForIssue(string owner, string name, int number,
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.IssueLabels(repositoryId, number), options);
         }
@@ -100,8 +100,8 @@ public IObservable<Label> GetAllForIssue(long repositoryId, int number, ApiOptio
         /// <param name="name">The name of the repository</param>
         public IObservable<Label> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -129,9 +129,9 @@ public IObservable<Label> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.Labels(owner, name), options);
         }
@@ -146,7 +146,7 @@ public IObservable<Label> GetAllForRepository(string owner, string name, ApiOpti
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.Labels(repositoryId), options);
         }
@@ -162,8 +162,8 @@ public IObservable<Label> GetAllForRepository(long repositoryId, ApiOptions opti
         /// <param name="number">The number of the milestone</param>
         public IObservable<Label> GetAllForMilestone(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForMilestone(owner, name, number, ApiOptions.None);
         }
@@ -193,9 +193,9 @@ public IObservable<Label> GetAllForMilestone(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForMilestone(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.MilestoneLabels(owner, name, number), options);
         }
@@ -211,7 +211,7 @@ public IObservable<Label> GetAllForMilestone(string owner, string name, int numb
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Label> GetAllForMilestone(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Label>(ApiUrls.MilestoneLabels(repositoryId, number), options);
         }
@@ -227,9 +227,9 @@ public IObservable<Label> GetAllForMilestone(long repositoryId, int number, ApiO
         /// <param name="labelName">The name of the label</param>
         public IObservable<Label> Get(string owner, string name, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.Get(owner, name, labelName).ToObservable();
         }
@@ -244,7 +244,7 @@ public IObservable<Label> Get(string owner, string name, string labelName)
         /// <param name="labelName">The name of the label</param>
         public IObservable<Label> Get(long repositoryId, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.Get(repositoryId, labelName).ToObservable();
         }
@@ -260,9 +260,9 @@ public IObservable<Label> Get(long repositoryId, string labelName)
         /// <param name="labelName">The name of the label</param>
         public IObservable<Unit> Delete(string owner, string name, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.Delete(owner, name, labelName).ToObservable();
         }
@@ -277,7 +277,7 @@ public IObservable<Unit> Delete(string owner, string name, string labelName)
         /// <param name="labelName">The name of the label</param>
         public IObservable<Unit> Delete(long repositoryId, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.Delete(repositoryId, labelName).ToObservable();
         }
@@ -293,9 +293,9 @@ public IObservable<Unit> Delete(long repositoryId, string labelName)
         /// <param name="newLabel">The data for the label to be created</param>
         public IObservable<Label> Create(string owner, string name, NewLabel newLabel)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newLabel, "newLabel");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newLabel, nameof(newLabel));
 
             return _client.Create(owner, name, newLabel).ToObservable();
         }
@@ -310,7 +310,7 @@ public IObservable<Label> Create(string owner, string name, NewLabel newLabel)
         /// <param name="newLabel">The data for the label to be created</param>
         public IObservable<Label> Create(long repositoryId, NewLabel newLabel)
         {
-            Ensure.ArgumentNotNull(newLabel, "newLabel");
+            Ensure.ArgumentNotNull(newLabel, nameof(newLabel));
 
             return _client.Create(repositoryId, newLabel).ToObservable();
         }
@@ -327,10 +327,10 @@ public IObservable<Label> Create(long repositoryId, NewLabel newLabel)
         /// <param name="labelUpdate">The data for the label to be updated</param>
         public IObservable<Label> Update(string owner, string name, string labelName, LabelUpdate labelUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
-            Ensure.ArgumentNotNull(labelUpdate, "labelUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
+            Ensure.ArgumentNotNull(labelUpdate, nameof(labelUpdate));
 
             return _client.Update(owner, name, labelName, labelUpdate).ToObservable();
         }
@@ -346,8 +346,8 @@ public IObservable<Label> Update(string owner, string name, string labelName, La
         /// <param name="labelUpdate">The data for the label to be updated</param>
         public IObservable<Label> Update(long repositoryId, string labelName, LabelUpdate labelUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
-            Ensure.ArgumentNotNull(labelUpdate, "labelUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
+            Ensure.ArgumentNotNull(labelUpdate, nameof(labelUpdate));
 
             return _client.Update(repositoryId, labelName, labelUpdate).ToObservable();
         }
@@ -364,9 +364,9 @@ public IObservable<Label> Update(long repositoryId, string labelName, LabelUpdat
         /// <param name="labels">The names of the labels to add</param>
         public IObservable<Label> AddToIssue(string owner, string name, int number, string[] labels)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return _client.AddToIssue(owner, name, number, labels)
                 .ToObservable()
@@ -384,7 +384,7 @@ public IObservable<Label> AddToIssue(string owner, string name, int number, stri
         /// <param name="labels">The names of the labels to add</param>
         public IObservable<Label> AddToIssue(long repositoryId, int number, string[] labels)
         {
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return _client.AddToIssue(repositoryId, number, labels)
                 .ToObservable()
@@ -403,9 +403,9 @@ public IObservable<Label> AddToIssue(long repositoryId, int number, string[] lab
         /// <param name="labelName">The name of the label to remove</param>
         public IObservable<Unit> RemoveFromIssue(string owner, string name, int number, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.RemoveFromIssue(owner, name, number, labelName).ToObservable();
         }
@@ -421,7 +421,7 @@ public IObservable<Unit> RemoveFromIssue(string owner, string name, int number,
         /// <param name="labelName">The name of the label to remove</param>
         public IObservable<Unit> RemoveFromIssue(long repositoryId, int number, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return _client.RemoveFromIssue(repositoryId, number, labelName).ToObservable();
         }
@@ -438,9 +438,9 @@ public IObservable<Unit> RemoveFromIssue(long repositoryId, int number, string l
         /// <param name="labels">The names of the labels to set</param>
         public IObservable<Label> ReplaceAllForIssue(string owner, string name, int number, string[] labels)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return _client.ReplaceAllForIssue(owner, name, number, labels)
                 .ToObservable()
@@ -458,7 +458,7 @@ public IObservable<Label> ReplaceAllForIssue(string owner, string name, int numb
         /// <param name="labels">The names of the labels to set</param>
         public IObservable<Label> ReplaceAllForIssue(long repositoryId, int number, string[] labels)
         {
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return _client.ReplaceAllForIssue(repositoryId, number, labels)
                 .ToObservable()
@@ -476,8 +476,8 @@ public IObservable<Label> ReplaceAllForIssue(long repositoryId, int number, stri
         /// <param name="number">The number of the issue</param>
         public IObservable<Unit> RemoveAllFromIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.RemoveAllFromIssue(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableMergingClient.cs b/Octokit.Reactive/Clients/ObservableMergingClient.cs
index 7827a7db31..d8428f5136 100644
--- a/Octokit.Reactive/Clients/ObservableMergingClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMergingClient.cs
@@ -9,7 +9,7 @@ public class ObservableMergingClient : IObservableMergingClient
 
         public ObservableMergingClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
             _client = client.Repository.Merging;
         }
 
@@ -25,9 +25,9 @@ public ObservableMergingClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<Merge> Create(string owner, string name, NewMerge merge)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(merge, "merge");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(merge, nameof(merge));
 
             return _client.Create(owner, name, merge).ToObservable();
         }
@@ -43,7 +43,7 @@ public IObservable<Merge> Create(string owner, string name, NewMerge merge)
         /// <returns></returns>
         public IObservable<Merge> Create(long repositoryId, NewMerge merge)
         {
-            Ensure.ArgumentNotNull(merge, "merge");
+            Ensure.ArgumentNotNull(merge, nameof(merge));
 
             return _client.Create(repositoryId, merge).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableMigrationClient.cs b/Octokit.Reactive/Clients/ObservableMigrationClient.cs
index 7eee1d42da..9c93487a2d 100644
--- a/Octokit.Reactive/Clients/ObservableMigrationClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMigrationClient.cs
@@ -4,7 +4,7 @@ public class ObservableMigrationClient : IObservableMigrationClient
     {
         public ObservableMigrationClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             Migrations = new ObservableMigrationsClient(client);
         }
diff --git a/Octokit.Reactive/Clients/ObservableMigrationsClient.cs b/Octokit.Reactive/Clients/ObservableMigrationsClient.cs
index 7066f3fb3f..93f471af10 100644
--- a/Octokit.Reactive/Clients/ObservableMigrationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMigrationsClient.cs
@@ -22,7 +22,7 @@ public class ObservableMigrationsClient : IObservableMigrationsClient
         /// <param name="client">An <see cref="IGitHubClient"/> for making requests.</param>
         public ObservableMigrationsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Migration.Migrations;
         }
diff --git a/Octokit.Reactive/Clients/ObservableMilestonesClient.cs b/Octokit.Reactive/Clients/ObservableMilestonesClient.cs
index c1a8b62c3f..29424d2304 100644
--- a/Octokit.Reactive/Clients/ObservableMilestonesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMilestonesClient.cs
@@ -18,7 +18,7 @@ public class ObservableMilestonesClient : IObservableMilestonesClient
 
         public ObservableMilestonesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Issue.Milestone;
             _connection = client.Connection;
@@ -33,8 +33,8 @@ public ObservableMilestonesClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<Milestone> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
@@ -62,8 +62,8 @@ public IObservable<Milestone> Get(long repositoryId, int number)
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -93,9 +93,9 @@ public IObservable<Milestone> GetAllForRepository(long repositoryId)
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Milestone>(ApiUrls.Milestones(owner, name), options);
         }
@@ -111,7 +111,7 @@ public IObservable<Milestone> GetAllForRepository(string owner, string name, Api
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Milestone>(ApiUrls.Milestones(repositoryId), options);
         }
@@ -128,9 +128,9 @@ public IObservable<Milestone> GetAllForRepository(long repositoryId, ApiOptions
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(string owner, string name, MilestoneRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -146,7 +146,7 @@ public IObservable<Milestone> GetAllForRepository(string owner, string name, Mil
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(long repositoryId, MilestoneRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -164,10 +164,10 @@ public IObservable<Milestone> GetAllForRepository(long repositoryId, MilestoneRe
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(string owner, string name, MilestoneRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Milestone>(ApiUrls.Milestones(owner, name),
                 request.ToParametersDictionary(), options);
@@ -185,8 +185,8 @@ public IObservable<Milestone> GetAllForRepository(string owner, string name, Mil
         /// <returns></returns>
         public IObservable<Milestone> GetAllForRepository(long repositoryId, MilestoneRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Milestone>(ApiUrls.Milestones(repositoryId),
                 request.ToParametersDictionary(), options);
@@ -203,9 +203,9 @@ public IObservable<Milestone> GetAllForRepository(long repositoryId, MilestoneRe
         /// <returns></returns>
         public IObservable<Milestone> Create(string owner, string name, NewMilestone newMilestone)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newMilestone, "newMilestone");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newMilestone, nameof(newMilestone));
 
             return _client.Create(owner, name, newMilestone).ToObservable();
         }
@@ -220,7 +220,7 @@ public IObservable<Milestone> Create(string owner, string name, NewMilestone new
         /// <returns></returns>
         public IObservable<Milestone> Create(long repositoryId, NewMilestone newMilestone)
         {
-            Ensure.ArgumentNotNull(newMilestone, "newMilestone");
+            Ensure.ArgumentNotNull(newMilestone, nameof(newMilestone));
 
             return _client.Create(repositoryId, newMilestone).ToObservable();
         }
@@ -238,9 +238,9 @@ public IObservable<Milestone> Create(long repositoryId, NewMilestone newMileston
         /// <returns></returns>
         public IObservable<Milestone> Update(string owner, string name, int number, MilestoneUpdate milestoneUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(milestoneUpdate, "milestoneUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(milestoneUpdate, nameof(milestoneUpdate));
 
             return _client.Update(owner, name, number, milestoneUpdate).ToObservable();
         }
@@ -257,7 +257,7 @@ public IObservable<Milestone> Update(string owner, string name, int number, Mile
         /// <returns></returns>
         public IObservable<Milestone> Update(long repositoryId, int number, MilestoneUpdate milestoneUpdate)
         {
-            Ensure.ArgumentNotNull(milestoneUpdate, "milestoneUpdate");
+            Ensure.ArgumentNotNull(milestoneUpdate, nameof(milestoneUpdate));
 
             return _client.Update(repositoryId, number, milestoneUpdate).ToObservable();
         }
@@ -273,8 +273,8 @@ public IObservable<Milestone> Update(long repositoryId, int number, MilestoneUpd
         /// <returns></returns>
         public IObservable<Unit> Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
index ca3bcd85c7..0795360b15 100644
--- a/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
+++ b/Octokit.Reactive/Clients/ObservableMiscellaneousClient.cs
@@ -11,7 +11,7 @@ public class ObservableMiscellaneousClient : IObservableMiscellaneousClient
 
         public ObservableMiscellaneousClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Miscellaneous;
         }
diff --git a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
index 6ab0b33555..20d4fe887a 100644
--- a/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableNotificationsClient.cs
@@ -18,7 +18,7 @@ public class ObservableNotificationsClient : IObservableNotificationsClient
 
         public ObservableNotificationsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _connection = client.Connection;
             _notificationsClient = client.Activity.Notifications;
@@ -40,7 +40,7 @@ public IObservable<Notification> GetAllForCurrent()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(), options);
         }
@@ -53,8 +53,8 @@ public IObservable<Notification> GetAllForCurrent(ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -78,9 +78,9 @@ public IObservable<Notification> GetAllForRepository(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(owner, name), options);
         }
@@ -93,7 +93,7 @@ public IObservable<Notification> GetAllForRepository(string owner, string name,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(repositoryId), options);
         }
@@ -105,7 +105,7 @@ public IObservable<Notification> GetAllForRepository(long repositoryId, ApiOptio
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForCurrent(NotificationsRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -118,8 +118,8 @@ public IObservable<Notification> GetAllForCurrent(NotificationsRequest request)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForCurrent(NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(), request.ToParametersDictionary(), options);
         }
@@ -133,9 +133,9 @@ public IObservable<Notification> GetAllForCurrent(NotificationsRequest request,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(string owner, string name, NotificationsRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -148,7 +148,7 @@ public IObservable<Notification> GetAllForRepository(string owner, string name,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(long repositoryId, NotificationsRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -163,10 +163,10 @@ public IObservable<Notification> GetAllForRepository(long repositoryId, Notifica
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(string owner, string name, NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(owner, name), request.ToParametersDictionary(), options);
         }
@@ -180,8 +180,8 @@ public IObservable<Notification> GetAllForRepository(string owner, string name,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<Notification> GetAllForRepository(long repositoryId, NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Notification>(ApiUrls.Notifications(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -202,7 +202,7 @@ public IObservable<Unit> MarkAsRead()
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-as-read</remarks>
         public IObservable<Unit> MarkAsRead(MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return _notificationsClient.MarkAsRead(markAsReadRequest).ToObservable();
         }
@@ -215,8 +215,8 @@ public IObservable<Unit> MarkAsRead(MarkAsReadRequest markAsReadRequest)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public IObservable<Unit> MarkAsReadForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _notificationsClient.MarkAsReadForRepository(owner, name).ToObservable();
         }
@@ -240,9 +240,9 @@ public IObservable<Unit> MarkAsReadForRepository(long repositoryId)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public IObservable<Unit> MarkAsReadForRepository(string owner, string name, MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return _notificationsClient.MarkAsReadForRepository(owner, name, markAsReadRequest).ToObservable();
         }
@@ -255,7 +255,7 @@ public IObservable<Unit> MarkAsReadForRepository(string owner, string name, Mark
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public IObservable<Unit> MarkAsReadForRepository(long repositoryId, MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return _notificationsClient.MarkAsReadForRepository(repositoryId, markAsReadRequest).ToObservable();
         }
@@ -298,7 +298,7 @@ public IObservable<ThreadSubscription> GetThreadSubscription(int id)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#set-a-thread-subscription</remarks>
         public IObservable<ThreadSubscription> SetThreadSubscription(int id, NewThreadSubscription threadSubscription)
         {
-            Ensure.ArgumentNotNull(threadSubscription, "threadSubscription");
+            Ensure.ArgumentNotNull(threadSubscription, nameof(threadSubscription));
 
             return _notificationsClient.SetThreadSubscription(id, threadSubscription).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableOauthClient.cs b/Octokit.Reactive/Clients/ObservableOauthClient.cs
index feb9f47d7f..62cce34790 100644
--- a/Octokit.Reactive/Clients/ObservableOauthClient.cs
+++ b/Octokit.Reactive/Clients/ObservableOauthClient.cs
@@ -9,7 +9,7 @@ public class ObservableOauthClient : IObservableOauthClient
 
         public ObservableOauthClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client;
         }
diff --git a/Octokit.Reactive/Clients/ObservableOrganizationMembersClient.cs b/Octokit.Reactive/Clients/ObservableOrganizationMembersClient.cs
index 6107f94a90..7cf9f03d12 100644
--- a/Octokit.Reactive/Clients/ObservableOrganizationMembersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableOrganizationMembersClient.cs
@@ -16,7 +16,7 @@ public class ObservableOrganizationMembersClient : IObservableOrganizationMember
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
         public ObservableOrganizationMembersClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Organization.Member;
             _connection = client.Connection;
@@ -44,7 +44,7 @@ public ObservableOrganizationMembersClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<User> GetAll(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, ApiOptions.None);
         }
@@ -72,8 +72,8 @@ public IObservable<User> GetAll(string org)
         /// <returns></returns>
         public IObservable<User> GetAll(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Members(org), options);
         }
@@ -101,7 +101,7 @@ public IObservable<User> GetAll(string org, ApiOptions options)
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersFilter filter)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, filter, ApiOptions.None);
         }
@@ -130,8 +130,8 @@ public IObservable<User> GetAll(string org, OrganizationMembersFilter filter)
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Members(org, filter), options);
         }
@@ -159,7 +159,7 @@ public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, Ap
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersRole role)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, role, ApiOptions.None);
         }
@@ -188,8 +188,8 @@ public IObservable<User> GetAll(string org, OrganizationMembersRole role)
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersRole role, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Members(org, role), options);
         }
@@ -218,7 +218,7 @@ public IObservable<User> GetAll(string org, OrganizationMembersRole role, ApiOpt
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, OrganizationMembersRole role)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, filter, role, ApiOptions.None);
         }
@@ -248,8 +248,8 @@ public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, Or
         /// <returns></returns>
         public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, OrganizationMembersRole role, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Members(org, filter, role), options);
         }
@@ -262,7 +262,7 @@ public IObservable<User> GetAll(string org, OrganizationMembersFilter filter, Or
         /// <returns></returns>
         public IObservable<User> GetAllPublic(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAllPublic(org, ApiOptions.None);
         }
@@ -276,8 +276,8 @@ public IObservable<User> GetAllPublic(string org)
         /// <returns></returns>
         public IObservable<User> GetAllPublic(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.PublicMembers(org), options);
         }
@@ -294,8 +294,8 @@ public IObservable<User> GetAllPublic(string org, ApiOptions options)
         /// <returns></returns>
         public IObservable<bool> CheckMember(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.CheckMember(org, user).ToObservable();
         }
@@ -312,8 +312,8 @@ public IObservable<bool> CheckMember(string org, string user)
         /// <returns></returns>
         public IObservable<bool> CheckMemberPublic(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.CheckMemberPublic(org, user).ToObservable();
         }
@@ -332,8 +332,8 @@ public IObservable<bool> CheckMemberPublic(string org, string user)
         /// <returns></returns>
         public IObservable<Unit> Delete(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Delete(org, user).ToObservable();
         }
@@ -351,8 +351,8 @@ public IObservable<Unit> Delete(string org, string user)
         /// <returns></returns>
         public IObservable<bool> Publicize(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Publicize(org, user).ToObservable();
         }
@@ -370,8 +370,8 @@ public IObservable<bool> Publicize(string org, string user)
         /// <returns></returns>
         public IObservable<Unit> Conceal(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Conceal(org, user).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs b/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
index d6d47823d8..035bcb76dc 100644
--- a/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableOrganizationsClient.cs
@@ -15,7 +15,7 @@ public class ObservableOrganizationsClient : IObservableOrganizationsClient
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
         public ObservableOrganizationsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             Member = new ObservableOrganizationMembersClient(client);
             Team = new ObservableTeamsClient(client);
@@ -47,7 +47,7 @@ public ObservableOrganizationsClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<Organization> Get(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return _client.Get(org).ToObservable();
         }
@@ -68,7 +68,7 @@ public IObservable<Organization> GetAllForCurrent()
         /// <returns></returns>
         public IObservable<Organization> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Organization>(ApiUrls.UserOrganizations());
         }
@@ -81,7 +81,7 @@ public IObservable<Organization> GetAllForCurrent(ApiOptions options)
         [Obsolete("Please use ObservableOrganizationsClient.GetAllForUser() instead. This method will be removed in a future version")]
         public IObservable<Organization> GetAll(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _connection.GetAndFlattenAllPages<Organization>(ApiUrls.UserOrganizations(user));
         }
@@ -95,8 +95,8 @@ public IObservable<Organization> GetAll(string user)
         [Obsolete("Please use ObservableOrganizationsClient.GetAllForUser() instead. This method will be removed in a future version")]
         public IObservable<Organization> GetAll(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Organization>(ApiUrls.UserOrganizations(user), options);
         }
@@ -108,7 +108,7 @@ public IObservable<Organization> GetAll(string user, ApiOptions options)
         /// <returns></returns>
         public IObservable<Organization> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _connection.GetAndFlattenAllPages<Organization>(ApiUrls.UserOrganizations(user));
         }
@@ -121,8 +121,8 @@ public IObservable<Organization> GetAllForUser(string user)
         /// <returns></returns>
         public IObservable<Organization> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Organization>(ApiUrls.UserOrganizations(user), options);
         }
@@ -143,7 +143,7 @@ public IObservable<Organization> GetAll()
         /// <returns></returns>
         public IObservable<Organization> GetAll(OrganizationRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var url = ApiUrls.AllOrganizations(request.Since);
 
@@ -159,8 +159,8 @@ public IObservable<Organization> GetAll(OrganizationRequest request)
         /// <returns>A <see cref="Organization"/></returns>
         public IObservable<Organization> Update(string organizationName, OrganizationUpdate updateRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organizationName, "organizationName");
-            Ensure.ArgumentNotNull(updateRequest, "updateRequest");
+            Ensure.ArgumentNotNullOrEmptyString(organizationName, nameof(organizationName));
+            Ensure.ArgumentNotNull(updateRequest, nameof(updateRequest));
 
             return _client.Update(organizationName, updateRequest).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableProjectCardsClient.cs b/Octokit.Reactive/Clients/ObservableProjectCardsClient.cs
index cb5f0cde9b..fc77652fa6 100644
--- a/Octokit.Reactive/Clients/ObservableProjectCardsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableProjectCardsClient.cs
@@ -18,7 +18,7 @@ public class ObservableProjectCardsClient : IObservableProjectCardsClient
 
         public ObservableProjectCardsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Project.Card;
             _connection = client.Connection;
@@ -46,7 +46,7 @@ public IObservable<ProjectCard> GetAll(int columnId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<ProjectCard> GetAll(int columnId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.ProjectCards(columnId);
 
@@ -75,7 +75,7 @@ public IObservable<ProjectCard> Get(int id)
         /// <param name="newProjectCard">The card to create</param>
         public IObservable<ProjectCard> Create(int columnId, NewProjectCard newProjectCard)
         {
-            Ensure.ArgumentNotNull(newProjectCard, "newProjectCard");
+            Ensure.ArgumentNotNull(newProjectCard, nameof(newProjectCard));
 
             return _client.Create(columnId, newProjectCard).ToObservable();
         }
@@ -90,7 +90,7 @@ public IObservable<ProjectCard> Create(int columnId, NewProjectCard newProjectCa
         /// <param name="projectCardUpdate">New values to update the card with</param>
         public IObservable<ProjectCard> Update(int id, ProjectCardUpdate projectCardUpdate)
         {
-            Ensure.ArgumentNotNull(projectCardUpdate, "projectCardUpdate");
+            Ensure.ArgumentNotNull(projectCardUpdate, nameof(projectCardUpdate));
 
             return _client.Update(id, projectCardUpdate).ToObservable();
         }
@@ -117,7 +117,7 @@ public IObservable<bool> Delete(int id)
         /// <param name="position">The position to move the card</param>
         public IObservable<bool> Move(int id, ProjectCardMove position)
         {
-            Ensure.ArgumentNotNull(position, "position");
+            Ensure.ArgumentNotNull(position, nameof(position));
 
             return _client.Move(id, position).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableProjectColumnsClient.cs b/Octokit.Reactive/Clients/ObservableProjectColumnsClient.cs
index 50e6aba5e9..c52d51fa1f 100644
--- a/Octokit.Reactive/Clients/ObservableProjectColumnsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableProjectColumnsClient.cs
@@ -12,7 +12,7 @@ public class ObservableProjectColumnsClient : IObservableProjectColumnsClient
 
         public ObservableProjectColumnsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Project.Column;
             _connection = client.Connection;
@@ -40,7 +40,7 @@ public IObservable<ProjectColumn> GetAll(int projectId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<ProjectColumn> GetAll(int projectId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.ProjectColumns(projectId);
 
@@ -69,7 +69,7 @@ public IObservable<ProjectColumn> Get(int id)
         /// <param name="newProjectColumn">The column to create</param>
         public IObservable<ProjectColumn> Create(int projectId, NewProjectColumn newProjectColumn)
         {
-            Ensure.ArgumentNotNull(newProjectColumn, "newProjectColumn");
+            Ensure.ArgumentNotNull(newProjectColumn, nameof(newProjectColumn));
 
             return _client.Create(projectId, newProjectColumn).ToObservable();
         }
@@ -84,7 +84,7 @@ public IObservable<ProjectColumn> Create(int projectId, NewProjectColumn newProj
         /// <param name="projectColumnUpdate">New values to update the column with</param>
         public IObservable<ProjectColumn> Update(int id, ProjectColumnUpdate projectColumnUpdate)
         {
-            Ensure.ArgumentNotNull(projectColumnUpdate, "projectColumnUpdate");
+            Ensure.ArgumentNotNull(projectColumnUpdate, nameof(projectColumnUpdate));
 
             return _client.Update(id, projectColumnUpdate).ToObservable();
         }
@@ -111,7 +111,7 @@ public IObservable<bool> Delete(int id)
         /// <param name="position">The position to move the column</param>
         public IObservable<bool> Move(int id, ProjectColumnMove position)
         {
-            Ensure.ArgumentNotNull(position, "position");
+            Ensure.ArgumentNotNull(position, nameof(position));
 
             return _client.Move(id, position).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableProjectsClient.cs b/Octokit.Reactive/Clients/ObservableProjectsClient.cs
index c2b55f011e..377092d7b6 100644
--- a/Octokit.Reactive/Clients/ObservableProjectsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableProjectsClient.cs
@@ -19,7 +19,7 @@ public class ObservableProjectsClient : IObservableProjectsClient
 
         public ObservableProjectsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Project;
             _connection = client.Connection;
@@ -51,9 +51,9 @@ public IObservable<Project> GetAllForRepository(string owner, string name)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.RepositoryProjects(owner, name);
 
@@ -86,10 +86,10 @@ public IObservable<Project> GetAllForRepository(string owner, string name, Proje
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForRepository(string owner, string name, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.RepositoryProjects(owner, name);
 
@@ -118,7 +118,7 @@ public IObservable<Project> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.RepositoryProjects(repositoryId);
 
@@ -149,8 +149,8 @@ public IObservable<Project> GetAllForRepository(long repositoryId, ProjectReques
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForRepository(long repositoryId, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.RepositoryProjects(repositoryId);
 
@@ -179,8 +179,8 @@ public IObservable<Project> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.OrganizationProjects(organization);
 
@@ -211,9 +211,9 @@ public IObservable<Project> GetAllForOrganization(string organization, ProjectRe
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Project> GetAllForOrganization(string organization, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var url = ApiUrls.OrganizationProjects(organization);
 
@@ -243,7 +243,7 @@ public IObservable<Project> Get(int id)
         /// <param name="newProject">The new project to create for the specified repository</param>
         public IObservable<Project> CreateForRepository(long repositoryId, NewProject newProject)
         {
-            Ensure.ArgumentNotNull(newProject, "newProject");
+            Ensure.ArgumentNotNull(newProject, nameof(newProject));
 
             return _client.CreateForRepository(repositoryId, newProject).ToObservable();
         }
@@ -258,8 +258,8 @@ public IObservable<Project> CreateForRepository(long repositoryId, NewProject ne
         /// <param name="newProject">The new project to create for the specified repository</param>
         public IObservable<Project> CreateForOrganization(string organization, NewProject newProject)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(newProject, "newProject");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(newProject, nameof(newProject));
 
             return _client.CreateForOrganization(organization, newProject).ToObservable();
         }
@@ -274,7 +274,7 @@ public IObservable<Project> CreateForOrganization(string organization, NewProjec
         /// <param name="projectUpdate">The modified project</param>
         public IObservable<Project> Update(int id, ProjectUpdate projectUpdate)
         {
-            Ensure.ArgumentNotNull(projectUpdate, "projectUpdate");
+            Ensure.ArgumentNotNull(projectUpdate, nameof(projectUpdate));
 
             return _client.Update(id, projectUpdate).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentReactionsClient.cs b/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentReactionsClient.cs
index 54b47a6ef8..b81169ad80 100644
--- a/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentReactionsClient.cs
@@ -17,7 +17,7 @@ public class ObservablePullRequestReviewCommentReactionsClient : IObservablePull
 
         public ObservablePullRequestReviewCommentReactionsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Reaction.PullRequestReviewComment;
             _connection = client.Connection;
@@ -32,8 +32,8 @@ public ObservablePullRequestReviewCommentReactionsClient(IGitHubClient client)
         /// <param name="number">The comment id</param>        
         public IObservable<Reaction> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.PullRequestReviewCommentReaction(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
@@ -59,9 +59,9 @@ public IObservable<Reaction> GetAll(long repositoryId, int number)
         /// <param name="reaction">The reaction to create</param>
         public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(owner, name, number, reaction).ToObservable();
         }
@@ -75,7 +75,7 @@ public IObservable<Reaction> Create(string owner, string name, int number, NewRe
         /// <param name="reaction">The reaction to create</param>
         public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return _client.Create(repositoryId, number, reaction).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentsClient.cs b/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentsClient.cs
index 4caefcd4f4..877ff4c111 100644
--- a/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservablePullRequestReviewCommentsClient.cs
@@ -18,7 +18,7 @@ public class ObservablePullRequestReviewCommentsClient : IObservablePullRequestR
 
         public ObservablePullRequestReviewCommentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.PullRequest.ReviewComment;
             _connection = client.Connection;
@@ -33,8 +33,8 @@ public ObservablePullRequestReviewCommentsClient(IGitHubClient client)
         /// <param name="number">The pull request number</param>
         public IObservable<PullRequestReviewComment> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, number, ApiOptions.None);
         }
@@ -60,9 +60,9 @@ public IObservable<PullRequestReviewComment> GetAll(long repositoryId, int numbe
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAll(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(owner, name, number), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -76,7 +76,7 @@ public IObservable<PullRequestReviewComment> GetAll(string owner, string name, i
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAll(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(repositoryId, number), options);
         }
@@ -89,8 +89,8 @@ public IObservable<PullRequestReviewComment> GetAll(long repositoryId, int numbe
         /// <param name="name">The name of the repository</param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, new PullRequestReviewCommentRequest(), ApiOptions.None);
         }
@@ -114,9 +114,9 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(long repository
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new PullRequestReviewCommentRequest(), options);
         }
@@ -129,7 +129,7 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, s
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new PullRequestReviewCommentRequest(), options);
         }
@@ -143,9 +143,9 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(long repository
         /// <param name="request">The sorting <see cref="PullRequestReviewCommentRequest">parameters</see></param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, string name, PullRequestReviewCommentRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -158,7 +158,7 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, s
         /// <param name="request">The sorting <see cref="PullRequestReviewCommentRequest">parameters</see></param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(long repositoryId, PullRequestReviewCommentRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -173,10 +173,10 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(long repository
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, string name, PullRequestReviewCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequestReviewComment>(ApiUrls.PullRequestReviewCommentsRepository(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview,
                 options);
@@ -191,8 +191,8 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(string owner, s
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequestReviewComment> GetAllForRepository(long repositoryId, PullRequestReviewCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequestReviewComment>(
                 ApiUrls.PullRequestReviewCommentsRepository(repositoryId),
@@ -210,8 +210,8 @@ public IObservable<PullRequestReviewComment> GetAllForRepository(long repository
         /// <param name="number">The pull request review comment number</param>
         public IObservable<PullRequestReviewComment> GetComment(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.GetComment(owner, name, number).ToObservable();
         }
@@ -237,9 +237,9 @@ public IObservable<PullRequestReviewComment> GetComment(long repositoryId, int n
         /// <param name="comment">The comment</param>
         public IObservable<PullRequestReviewComment> Create(string owner, string name, int number, PullRequestReviewCommentCreate comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.Create(owner, name, number, comment).ToObservable();
         }
@@ -253,7 +253,7 @@ public IObservable<PullRequestReviewComment> Create(string owner, string name, i
         /// <param name="comment">The comment</param>
         public IObservable<PullRequestReviewComment> Create(long repositoryId, int number, PullRequestReviewCommentCreate comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.Create(repositoryId, number, comment).ToObservable();
         }
@@ -268,9 +268,9 @@ public IObservable<PullRequestReviewComment> Create(long repositoryId, int numbe
         /// <param name="comment">The comment</param>
         public IObservable<PullRequestReviewComment> CreateReply(string owner, string name, int number, PullRequestReviewCommentReplyCreate comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.CreateReply(owner, name, number, comment).ToObservable();
         }
@@ -284,7 +284,7 @@ public IObservable<PullRequestReviewComment> CreateReply(string owner, string na
         /// <param name="comment">The comment</param>
         public IObservable<PullRequestReviewComment> CreateReply(long repositoryId, int number, PullRequestReviewCommentReplyCreate comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.CreateReply(repositoryId, number, comment).ToObservable();
         }
@@ -299,9 +299,9 @@ public IObservable<PullRequestReviewComment> CreateReply(long repositoryId, int
         /// <param name="comment">The edited comment</param>
         public IObservable<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.Edit(owner, name, number, comment).ToObservable();
         }
@@ -315,7 +315,7 @@ public IObservable<PullRequestReviewComment> Edit(string owner, string name, int
         /// <param name="comment">The edited comment</param>
         public IObservable<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return _client.Edit(repositoryId, number, comment).ToObservable();
         }
@@ -329,8 +329,8 @@ public IObservable<PullRequestReviewComment> Edit(long repositoryId, int number,
         /// <param name="number">The pull request review comment number</param>
         public IObservable<Unit> Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservablePullRequestReviewRequestsClient.cs b/Octokit.Reactive/Clients/ObservablePullRequestReviewRequestsClient.cs
index 1a26b9263b..46467c046a 100644
--- a/Octokit.Reactive/Clients/ObservablePullRequestReviewRequestsClient.cs
+++ b/Octokit.Reactive/Clients/ObservablePullRequestReviewRequestsClient.cs
@@ -12,7 +12,7 @@ public class ObservablePullRequestReviewRequestsClient : IObservablePullRequestR
 
         public ObservablePullRequestReviewRequestsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.PullRequest.ReviewRequest;
             _connection = client.Connection;
@@ -27,8 +27,8 @@ public ObservablePullRequestReviewRequestsClient(IGitHubClient client)
         /// <param name="number">The pull request number</param>
         public IObservable<User> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.PullRequestReviewRequests(owner, name, number), null, AcceptHeaders.PullRequestReviewsApiPreview);
         }
@@ -43,9 +43,9 @@ public IObservable<User> GetAll(string owner, string name, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<User> GetAll(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.PullRequestReviewRequests(owner, name, number), null, AcceptHeaders.PullRequestReviewsApiPreview, options);
         }
@@ -70,7 +70,7 @@ public IObservable<User> GetAll(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<User> GetAll(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.PullRequestReviewRequests(repositoryId, number), null, AcceptHeaders.PullRequestReviewsApiPreview, options);
         }
@@ -85,9 +85,9 @@ public IObservable<User> GetAll(long repositoryId, int number, ApiOptions option
         /// <param name="users">List of logins of user will be requested for review</param>
         public IObservable<PullRequest> Create(string owner, string name, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.Create(owner, name, number, users).ToObservable();
         }
@@ -101,7 +101,7 @@ public IObservable<PullRequest> Create(string owner, string name, int number, Pu
         /// <param name="users">List of logins of user will be requested for review</param>
         public IObservable<PullRequest> Create(long repositoryId, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.Create(repositoryId, number, users).ToObservable();
         }
@@ -116,9 +116,9 @@ public IObservable<PullRequest> Create(long repositoryId, int number, PullReques
         /// <param name="users">List of logins of users that will be not longer requested for review</param>
         public IObservable<Unit> Delete(string owner, string name, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.Delete(owner, name, number, users).ToObservable();
         }
@@ -132,7 +132,7 @@ public IObservable<Unit> Delete(string owner, string name, int number, PullReque
         /// <param name="users">List of logins of users that will be not longer requested for review</param>
         public IObservable<Unit> Delete(long repositoryId, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.Delete(repositoryId, number, users).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs b/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
index 7787544c49..2aefae050e 100644
--- a/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
+++ b/Octokit.Reactive/Clients/ObservablePullRequestsClient.cs
@@ -38,7 +38,7 @@ public class ObservablePullRequestsClient : IObservablePullRequestsClient
 
         public ObservablePullRequestsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.PullRequest;
             _connection = client.Connection;
@@ -55,8 +55,8 @@ public ObservablePullRequestsClient(IGitHubClient client)
         /// </remarks>
         public IObservable<PullRequest> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
@@ -84,8 +84,8 @@ public IObservable<PullRequest> Get(long repositoryId, int number)
         /// <param name="name">The name of the repository</param>
         public IObservable<PullRequest> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -113,9 +113,9 @@ public IObservable<PullRequest> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequest> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequest>(ApiUrls.PullRequests(owner, name), options);
         }
@@ -130,7 +130,7 @@ public IObservable<PullRequest> GetAllForRepository(string owner, string name, A
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequest> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequest>(ApiUrls.PullRequests(repositoryId), options);
         }
@@ -146,9 +146,9 @@ public IObservable<PullRequest> GetAllForRepository(long repositoryId, ApiOption
         /// <param name="request">Used to filter and sort the list of pull requests returned</param>
         public IObservable<PullRequest> GetAllForRepository(string owner, string name, PullRequestRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -163,7 +163,7 @@ public IObservable<PullRequest> GetAllForRepository(string owner, string name, P
         /// <param name="request">Used to filter and sort the list of pull requests returned</param>
         public IObservable<PullRequest> GetAllForRepository(long repositoryId, PullRequestRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -180,10 +180,10 @@ public IObservable<PullRequest> GetAllForRepository(long repositoryId, PullReque
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequest> GetAllForRepository(string owner, string name, PullRequestRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequest>(ApiUrls.PullRequests(owner, name),
                 request.ToParametersDictionary(), options);
@@ -200,8 +200,8 @@ public IObservable<PullRequest> GetAllForRepository(string owner, string name, P
         /// <param name="options">Options for changing the API response</param>
         public IObservable<PullRequest> GetAllForRepository(long repositoryId, PullRequestRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PullRequest>(ApiUrls.PullRequests(repositoryId),
                 request.ToParametersDictionary(), options);
@@ -216,9 +216,9 @@ public IObservable<PullRequest> GetAllForRepository(long repositoryId, PullReque
         /// <param name="newPullRequest">A <see cref="NewPullRequest"/> instance describing the new PullRequest to create</param>
         public IObservable<PullRequest> Create(string owner, string name, NewPullRequest newPullRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newPullRequest, "newPullRequest");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newPullRequest, nameof(newPullRequest));
 
             return _client.Create(owner, name, newPullRequest).ToObservable();
         }
@@ -231,7 +231,7 @@ public IObservable<PullRequest> Create(string owner, string name, NewPullRequest
         /// <param name="newPullRequest">A <see cref="NewPullRequest"/> instance describing the new PullRequest to create</param>
         public IObservable<PullRequest> Create(long repositoryId, NewPullRequest newPullRequest)
         {
-            Ensure.ArgumentNotNull(newPullRequest, "newPullRequest");
+            Ensure.ArgumentNotNull(newPullRequest, nameof(newPullRequest));
 
             return _client.Create(repositoryId, newPullRequest).ToObservable();
         }
@@ -247,9 +247,9 @@ public IObservable<PullRequest> Create(long repositoryId, NewPullRequest newPull
         /// </param>
         public IObservable<PullRequest> Update(string owner, string name, int number, PullRequestUpdate pullRequestUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(pullRequestUpdate, "pullRequestUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(pullRequestUpdate, nameof(pullRequestUpdate));
 
             return _client.Update(owner, name, number, pullRequestUpdate).ToObservable();
         }
@@ -264,7 +264,7 @@ public IObservable<PullRequest> Update(string owner, string name, int number, Pu
         /// </param>
         public IObservable<PullRequest> Update(long repositoryId, int number, PullRequestUpdate pullRequestUpdate)
         {
-            Ensure.ArgumentNotNull(pullRequestUpdate, "pullRequestUpdate");
+            Ensure.ArgumentNotNull(pullRequestUpdate, nameof(pullRequestUpdate));
 
             return _client.Update(repositoryId, number, pullRequestUpdate).ToObservable();
         }
@@ -279,9 +279,9 @@ public IObservable<PullRequest> Update(long repositoryId, int number, PullReques
         /// <param name="mergePullRequest">A <see cref="MergePullRequest"/> instance describing a pull request merge</param>
         public IObservable<PullRequestMerge> Merge(string owner, string name, int number, MergePullRequest mergePullRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(mergePullRequest, "mergePullRequest");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(mergePullRequest, nameof(mergePullRequest));
 
             return _client.Merge(owner, name, number, mergePullRequest).ToObservable();
         }
@@ -295,7 +295,7 @@ public IObservable<PullRequestMerge> Merge(string owner, string name, int number
         /// <param name="mergePullRequest">A <see cref="MergePullRequest"/> instance describing a pull request merge</param>
         public IObservable<PullRequestMerge> Merge(long repositoryId, int number, MergePullRequest mergePullRequest)
         {
-            Ensure.ArgumentNotNull(mergePullRequest, "mergePullRequest");
+            Ensure.ArgumentNotNull(mergePullRequest, nameof(mergePullRequest));
 
             return _client.Merge(repositoryId, number, mergePullRequest).ToObservable();
         }
@@ -309,8 +309,8 @@ public IObservable<PullRequestMerge> Merge(long repositoryId, int number, MergeP
         /// <param name="number">The pull request number</param>
         public IObservable<bool> Merged(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Merged(owner, name, number).ToObservable();
         }
@@ -335,8 +335,8 @@ public IObservable<bool> Merged(long repositoryId, int number)
         /// <param name="number">The pull request number</param>
         public IObservable<PullRequestCommit> Commits(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<PullRequestCommit>(ApiUrls.PullRequestCommits(owner, name, number));
         }
@@ -361,8 +361,8 @@ public IObservable<PullRequestCommit> Commits(long repositoryId, int number)
         /// <param name="number">The pull request number</param>
         public IObservable<PullRequestFile> Files(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _connection.GetAndFlattenAllPages<PullRequestFile>(ApiUrls.PullRequestFiles(owner, name, number));
         }
diff --git a/Octokit.Reactive/Clients/ObservableReactionsClient.cs b/Octokit.Reactive/Clients/ObservableReactionsClient.cs
index 3cd3e9b3b7..8cf793931d 100644
--- a/Octokit.Reactive/Clients/ObservableReactionsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableReactionsClient.cs
@@ -10,7 +10,7 @@ public class ObservableReactionsClient : IObservableReactionsClient
 
         public ObservableReactionsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Reaction;
 
diff --git a/Octokit.Reactive/Clients/ObservableReferencesClient.cs b/Octokit.Reactive/Clients/ObservableReferencesClient.cs
index bb16a5d3ca..4cf3df8159 100644
--- a/Octokit.Reactive/Clients/ObservableReferencesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableReferencesClient.cs
@@ -18,7 +18,7 @@ public class ObservableReferencesClient : IObservableReferencesClient
 
         public ObservableReferencesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _reference = client.Git.Reference;
             _connection = client.Connection;
@@ -36,9 +36,9 @@ public ObservableReferencesClient(IGitHubClient client)
         /// <returns></returns>
         public IObservable<Reference> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _reference.Get(owner, name, reference).ToObservable();
         }
@@ -54,7 +54,7 @@ public IObservable<Reference> Get(string owner, string name, string reference)
         /// <returns></returns>
         public IObservable<Reference> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _reference.Get(repositoryId, reference).ToObservable();
         }
@@ -85,9 +85,9 @@ public IObservable<Reference> GetAll(string owner, string name)
         /// <returns></returns>
         public IObservable<Reference> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Reference>(ApiUrls.Reference(owner, name), options);
         }
@@ -116,7 +116,7 @@ public IObservable<Reference> GetAll(long repositoryId)
         /// <returns></returns>
         public IObservable<Reference> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Reference>(ApiUrls.Reference(repositoryId), options);
         }
@@ -149,10 +149,10 @@ public IObservable<Reference> GetAllForSubNamespace(string owner, string name, s
         /// <returns></returns>
         public IObservable<Reference> GetAllForSubNamespace(string owner, string name, string subNamespace, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(subNamespace, "subNamespace");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(subNamespace, nameof(subNamespace));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Reference>(ApiUrls.Reference(owner, name, subNamespace), options);
         }
@@ -183,8 +183,8 @@ public IObservable<Reference> GetAllForSubNamespace(long repositoryId, string su
         /// <returns></returns>
         public IObservable<Reference> GetAllForSubNamespace(long repositoryId, string subNamespace, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(subNamespace, "subNamespace");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(subNamespace, nameof(subNamespace));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Reference>(ApiUrls.Reference(repositoryId, subNamespace), options);
         }
@@ -201,9 +201,9 @@ public IObservable<Reference> GetAllForSubNamespace(long repositoryId, string su
         /// <returns></returns>
         public IObservable<Reference> Create(string owner, string name, NewReference reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return _reference.Create(owner, name, reference).ToObservable();
         }
@@ -219,7 +219,7 @@ public IObservable<Reference> Create(string owner, string name, NewReference ref
         /// <returns></returns>
         public IObservable<Reference> Create(long repositoryId, NewReference reference)
         {
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return _reference.Create(repositoryId, reference).ToObservable();
         }
@@ -237,10 +237,10 @@ public IObservable<Reference> Create(long repositoryId, NewReference reference)
         /// <returns></returns>
         public IObservable<Reference> Update(string owner, string name, string reference, ReferenceUpdate referenceUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(referenceUpdate, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(referenceUpdate, nameof(referenceUpdate));
 
             return _reference.Update(owner, name, reference, referenceUpdate).ToObservable();
         }
@@ -257,8 +257,8 @@ public IObservable<Reference> Update(string owner, string name, string reference
         /// <returns></returns>
         public IObservable<Reference> Update(long repositoryId, string reference, ReferenceUpdate referenceUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(referenceUpdate, "update");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(referenceUpdate, nameof(referenceUpdate));
 
             return _reference.Update(repositoryId, reference, referenceUpdate).ToObservable();
         }
@@ -275,9 +275,9 @@ public IObservable<Reference> Update(long repositoryId, string reference, Refere
         /// <returns></returns>
         public IObservable<Unit> Delete(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _reference.Delete(owner, name, reference).ToObservable();
         }
@@ -293,7 +293,7 @@ public IObservable<Unit> Delete(string owner, string name, string reference)
         /// <returns></returns>
         public IObservable<Unit> Delete(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _reference.Delete(repositoryId, reference).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableReleasesClient.cs b/Octokit.Reactive/Clients/ObservableReleasesClient.cs
index 2a98e85fd8..25d6abb3df 100644
--- a/Octokit.Reactive/Clients/ObservableReleasesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableReleasesClient.cs
@@ -18,7 +18,7 @@ public class ObservableReleasesClient : IObservableReleasesClient
 
         public ObservableReleasesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Release;
             _connection = client.Connection;
@@ -35,8 +35,8 @@ public ObservableReleasesClient(IGitHubClient client)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -66,9 +66,9 @@ public IObservable<Release> GetAll(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Release>(ApiUrls.Releases(owner, name), options);
         }
@@ -84,7 +84,7 @@ public IObservable<Release> GetAll(string owner, string name, ApiOptions options
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Release>(ApiUrls.Releases(repositoryId), options);
         }
@@ -101,8 +101,8 @@ public IObservable<Release> GetAll(long repositoryId, ApiOptions options)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> Get(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, id).ToObservable();
         }
@@ -132,8 +132,8 @@ public IObservable<Release> Get(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> GetLatest(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.GetLatest(owner, name).ToObservable();
         }
@@ -163,9 +163,9 @@ public IObservable<Release> GetLatest(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> Create(string owner, string name, NewRelease data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.Create(owner, name, data).ToObservable();
         }
@@ -181,7 +181,7 @@ public IObservable<Release> Create(string owner, string name, NewRelease data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> Create(long repositoryId, NewRelease data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.Create(repositoryId, data).ToObservable();
         }
@@ -199,9 +199,9 @@ public IObservable<Release> Create(long repositoryId, NewRelease data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> Edit(string owner, string name, int id, ReleaseUpdate data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.Edit(owner, name, id, data).ToObservable();
         }
@@ -218,7 +218,7 @@ public IObservable<Release> Edit(string owner, string name, int id, ReleaseUpdat
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Release> Edit(long repositoryId, int id, ReleaseUpdate data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.Edit(repositoryId, id, data).ToObservable();
         }
@@ -235,8 +235,8 @@ public IObservable<Release> Edit(long repositoryId, int id, ReleaseUpdate data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Unit> Delete(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, id).ToObservable();
         }
@@ -267,8 +267,8 @@ public IObservable<Unit> Delete(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<ReleaseAsset> GetAllAssets(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllAssets(owner, name, id, ApiOptions.None);
         }
@@ -300,9 +300,9 @@ public IObservable<ReleaseAsset> GetAllAssets(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<ReleaseAsset> GetAllAssets(string owner, string name, int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<ReleaseAsset>(ApiUrls.ReleaseAssets(owner, name, id), options);
         }
@@ -319,7 +319,7 @@ public IObservable<ReleaseAsset> GetAllAssets(string owner, string name, int id,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<ReleaseAsset> GetAllAssets(long repositoryId, int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<ReleaseAsset>(ApiUrls.ReleaseAssets(repositoryId, id), options);
         }
@@ -335,9 +335,9 @@ public IObservable<ReleaseAsset> GetAllAssets(long repositoryId, int id, ApiOpti
         /// <param name="assetId">The id of the <see cref="ReleaseAsset"/></param>
         public IObservable<ReleaseAsset> GetAsset(string owner, string name, int assetId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(assetId, "assetId");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(assetId, nameof(assetId));
 
             return _client.GetAsset(owner, name, assetId).ToObservable();
         }
@@ -352,7 +352,7 @@ public IObservable<ReleaseAsset> GetAsset(string owner, string name, int assetId
         /// <param name="assetId">The id of the <see cref="ReleaseAsset"/></param>
         public IObservable<ReleaseAsset> GetAsset(long repositoryId, int assetId)
         {
-            Ensure.ArgumentNotNull(assetId, "assetId");
+            Ensure.ArgumentNotNull(assetId, nameof(assetId));
 
             return _client.GetAsset(repositoryId, assetId).ToObservable();
         }
@@ -368,8 +368,8 @@ public IObservable<ReleaseAsset> GetAsset(long repositoryId, int assetId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<ReleaseAsset> UploadAsset(Release release, ReleaseAssetUpload data)
         {
-            Ensure.ArgumentNotNull(release, "release");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(release, nameof(release));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.UploadAsset(release, data).ToObservable();
         }
@@ -386,9 +386,9 @@ public IObservable<ReleaseAsset> UploadAsset(Release release, ReleaseAssetUpload
         /// <param name="data">Description of the asset with its amended data</param>
         public IObservable<ReleaseAsset> EditAsset(string owner, string name, int assetId, ReleaseAssetUpdate data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.EditAsset(owner, name, assetId, data).ToObservable();
         }
@@ -404,7 +404,7 @@ public IObservable<ReleaseAsset> EditAsset(string owner, string name, int assetI
         /// <param name="data">Description of the asset with its amended data</param>
         public IObservable<ReleaseAsset> EditAsset(long repositoryId, int assetId, ReleaseAssetUpdate data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return _client.EditAsset(repositoryId, assetId, data).ToObservable();
         }
@@ -420,8 +420,8 @@ public IObservable<ReleaseAsset> EditAsset(long repositoryId, int assetId, Relea
         /// <param name="id">The id of the <see cref="ReleaseAsset"/>.</param>
         public IObservable<Unit> DeleteAsset(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.DeleteAsset(owner, name, id).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
index 68ff0f6c6b..719d8614bc 100644
--- a/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepoCollaboratorsClient.cs
@@ -22,7 +22,7 @@ public class ObservableRepoCollaboratorsClient : IObservableRepoCollaboratorsCli
         /// <param name="client">An IGitHubClient client.</param>
         public ObservableRepoCollaboratorsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Collaborator;
             _connection = client.Connection;
@@ -39,8 +39,8 @@ public ObservableRepoCollaboratorsClient(IGitHubClient client)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<User> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -70,9 +70,9 @@ public IObservable<User> GetAll(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<User> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.RepoCollaborators(owner, name), options);
         }
@@ -88,7 +88,7 @@ public IObservable<User> GetAll(string owner, string name, ApiOptions options)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<User> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.RepoCollaborators(repositoryId), options);
         }
@@ -105,9 +105,9 @@ public IObservable<User> GetAll(long repositoryId, ApiOptions options)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<bool> IsCollaborator(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.IsCollaborator(owner, name, user).ToObservable();
         }
@@ -123,7 +123,7 @@ public IObservable<bool> IsCollaborator(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<bool> IsCollaborator(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.IsCollaborator(repositoryId, user).ToObservable();
         }
@@ -140,9 +140,9 @@ public IObservable<bool> IsCollaborator(long repositoryId, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<CollaboratorPermission> ReviewPermission(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.ReviewPermission(owner, name, user).ToObservable();
         }
@@ -158,7 +158,7 @@ public IObservable<CollaboratorPermission> ReviewPermission(string owner, string
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<CollaboratorPermission> ReviewPermission(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.ReviewPermission(repositoryId, user).ToObservable();
         }
@@ -175,9 +175,9 @@ public IObservable<CollaboratorPermission> ReviewPermission(long repositoryId, s
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Unit> Add(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Add(owner, name, user).ToObservable();
         }
@@ -195,10 +195,10 @@ public IObservable<Unit> Add(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<bool> Add(string owner, string name, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "permission");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return _client.Add(owner, name, user, permission).ToObservable();
         }
@@ -214,7 +214,7 @@ public IObservable<bool> Add(string owner, string name, string user, Collaborato
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Unit> Add(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Add(repositoryId, user).ToObservable();
         }
@@ -231,8 +231,8 @@ public IObservable<Unit> Add(long repositoryId, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<bool> Add(long repositoryId, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "permission");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return _client.Add(repositoryId, user, permission).ToObservable();
         }
@@ -248,9 +248,9 @@ public IObservable<bool> Add(long repositoryId, string user, CollaboratorRequest
         /// <param name="user">The username of the prospective collaborator</param>        
         public IObservable<RepositoryInvitation> Invite(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Invite(owner, name, user).ToObservable();
         }
@@ -267,10 +267,10 @@ public IObservable<RepositoryInvitation> Invite(string owner, string name, strin
         /// <param name="permission">The permission to set. Only valid on organization-owned repositories.</param>
         public IObservable<RepositoryInvitation> Invite(string owner, string name, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "psermission");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return _client.Invite(owner, name, user, permission).ToObservable();
         }
@@ -286,7 +286,7 @@ public IObservable<RepositoryInvitation> Invite(string owner, string name, strin
 
         public IObservable<RepositoryInvitation> Invite(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Invite(repositoryId, user).ToObservable();
         }
@@ -302,8 +302,8 @@ public IObservable<RepositoryInvitation> Invite(long repositoryId, string user)
         /// <param name="permission">The permission to set. Only valid on organization-owned repositories.</param>
         public IObservable<RepositoryInvitation> Invite(long repositoryId, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "psermission");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return _client.Invite(repositoryId, user, permission).ToObservable();
         }
@@ -320,9 +320,9 @@ public IObservable<RepositoryInvitation> Invite(long repositoryId, string user,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Unit> Delete(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Delete(owner, name, user).ToObservable();
         }
@@ -338,7 +338,7 @@ public IObservable<Unit> Delete(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public IObservable<Unit> Delete(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return _client.Delete(repositoryId, user).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
index 137dd466f4..394be43594 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoriesClient.cs
@@ -16,7 +16,7 @@ public class ObservableRepositoriesClient : IObservableRepositoriesClient
 
         public ObservableRepositoriesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository;
             _connection = client.Connection;
@@ -47,7 +47,7 @@ public ObservableRepositoriesClient(IGitHubClient client)
         /// <returns>An <see cref="IObservable{Repository}"/> instance for the created repository</returns>
         public IObservable<Repository> Create(NewRepository newRepository)
         {
-            Ensure.ArgumentNotNull(newRepository, "newRepository");
+            Ensure.ArgumentNotNull(newRepository, nameof(newRepository));
             if (string.IsNullOrEmpty(newRepository.Name))
                 throw new ArgumentException("The new repository's name must not be null.");
 
@@ -62,8 +62,8 @@ public IObservable<Repository> Create(NewRepository newRepository)
         /// <returns>An <see cref="IObservable{Repository}"/> instance for the created repository</returns>
         public IObservable<Repository> Create(string organizationLogin, NewRepository newRepository)
         {
-            Ensure.ArgumentNotNull(organizationLogin, "organizationLogin");
-            Ensure.ArgumentNotNull(newRepository, "newRepository");
+            Ensure.ArgumentNotNull(organizationLogin, nameof(organizationLogin));
+            Ensure.ArgumentNotNull(newRepository, nameof(newRepository));
             if (string.IsNullOrEmpty(newRepository.Name))
                 throw new ArgumentException("The new repository's name must not be null.");
 
@@ -79,8 +79,8 @@ public IObservable<Repository> Create(string organizationLogin, NewRepository ne
         /// <returns>An <see cref="IObservable{Unit}"/> for the operation</returns>
         public IObservable<Unit> Delete(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name).ToObservable();
         }
@@ -104,8 +104,8 @@ public IObservable<Unit> Delete(long repositoryId)
         /// <returns>A <see cref="Repository"/></returns>
         public IObservable<Repository> Get(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name).ToObservable();
         }
@@ -142,7 +142,7 @@ public IObservable<Repository> GetAllPublic()
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllPublic(PublicRepositoryRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var url = ApiUrls.AllPublicRepositories(request.Since);
 
@@ -170,7 +170,7 @@ public IObservable<Repository> GetAllForCurrent()
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Repositories(), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -186,7 +186,7 @@ public IObservable<Repository> GetAllForCurrent(ApiOptions options)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForCurrent(RepositoryRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -200,8 +200,8 @@ public IObservable<Repository> GetAllForCurrent(RepositoryRequest request)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForCurrent(RepositoryRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Repositories(), request.ToParametersDictionary(), AcceptHeaders.LicensesApiPreview);
         }
@@ -213,7 +213,7 @@ public IObservable<Repository> GetAllForCurrent(RepositoryRequest request, ApiOp
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForUser(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAllForUser(login, ApiOptions.None);
         }
@@ -226,8 +226,8 @@ public IObservable<Repository> GetAllForUser(string login)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForUser(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Repositories(login), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -241,7 +241,7 @@ public IObservable<Repository> GetAllForUser(string login, ApiOptions options)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForOrg(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrg(organization, ApiOptions.None);
         }
@@ -254,8 +254,8 @@ public IObservable<Repository> GetAllForOrg(string organization)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public IObservable<Repository> GetAllForOrg(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.OrganizationRepositories(organization), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -334,8 +334,8 @@ public IObservable<Repository> GetAllForOrg(string organization, ApiOptions opti
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllContributors(owner, name, ApiOptions.None);
         }
@@ -365,9 +365,9 @@ public IObservable<RepositoryContributor> GetAllContributors(long repositoryId)
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllContributors(owner, name, false, options);
         }
@@ -383,7 +383,7 @@ public IObservable<RepositoryContributor> GetAllContributors(string owner, strin
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllContributors(repositoryId, false, options);
         }
@@ -400,8 +400,8 @@ public IObservable<RepositoryContributor> GetAllContributors(long repositoryId,
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(string owner, string name, bool includeAnonymous)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllContributors(owner, name, includeAnonymous, ApiOptions.None);
         }
@@ -433,9 +433,9 @@ public IObservable<RepositoryContributor> GetAllContributors(long repositoryId,
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(string owner, string name, bool includeAnonymous, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.RepositoryContributors(owner, name);
             var parameters = new Dictionary<string, string>();
@@ -457,7 +457,7 @@ public IObservable<RepositoryContributor> GetAllContributors(string owner, strin
         /// <returns>All contributors of the repository.</returns>
         public IObservable<RepositoryContributor> GetAllContributors(long repositoryId, bool includeAnonymous, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.RepositoryContributors(repositoryId);
             var parameters = new Dictionary<string, string>();
@@ -478,8 +478,8 @@ public IObservable<RepositoryContributor> GetAllContributors(long repositoryId,
         /// <returns>All languages used in the repository and the number of bytes of each language.</returns>
         public IObservable<RepositoryLanguage> GetAllLanguages(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.RepositoryLanguages(owner, name);
             return _connection
@@ -514,8 +514,8 @@ public IObservable<RepositoryLanguage> GetAllLanguages(long repositoryId)
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public IObservable<Team> GetAllTeams(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllTeams(owner, name, ApiOptions.None);
         }
@@ -545,9 +545,9 @@ public IObservable<Team> GetAllTeams(long repositoryId)
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public IObservable<Team> GetAllTeams(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Team>(ApiUrls.RepositoryTeams(owner, name), options);
         }
@@ -563,7 +563,7 @@ public IObservable<Team> GetAllTeams(string owner, string name, ApiOptions optio
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public IObservable<Team> GetAllTeams(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Team>(ApiUrls.RepositoryTeams(repositoryId), options);
         }
@@ -579,8 +579,8 @@ public IObservable<Team> GetAllTeams(long repositoryId, ApiOptions options)
         /// <returns>All of the repositories tags.</returns>
         public IObservable<RepositoryTag> GetAllTags(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllTags(owner, name, ApiOptions.None);
         }
@@ -610,9 +610,9 @@ public IObservable<RepositoryTag> GetAllTags(long repositoryId)
         /// <returns>All of the repositories tags.</returns>
         public IObservable<RepositoryTag> GetAllTags(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryTag>(ApiUrls.RepositoryTags(owner, name), options);
         }
@@ -628,7 +628,7 @@ public IObservable<RepositoryTag> GetAllTags(string owner, string name, ApiOptio
         /// <returns>All of the repositories tags.</returns>
         public IObservable<RepositoryTag> GetAllTags(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryTag>(ApiUrls.RepositoryTags(repositoryId), options);
         }
@@ -642,9 +642,9 @@ public IObservable<RepositoryTag> GetAllTags(long repositoryId, ApiOptions optio
         /// <returns>The updated <see cref="T:Octokit.Repository"/></returns>
         public IObservable<Repository> Edit(string owner, string name, RepositoryUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.Edit(owner, name, update).ToObservable();
         }
@@ -687,7 +687,7 @@ public IObservable<RepositoryContentLicense> GetLicenseContents(long repositoryI
         /// <returns>The updated <see cref="T:Octokit.Repository"/></returns>
         public IObservable<Repository> Edit(long repositoryId, RepositoryUpdate update)
         {
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.Edit(repositoryId, update).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryBranchesClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryBranchesClient.cs
index e289f560f7..55a3230a12 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryBranchesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryBranchesClient.cs
@@ -14,7 +14,7 @@ public class ObservableRepositoryBranchesClient : IObservableRepositoryBranchesC
 
         public ObservableRepositoryBranchesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Branch;
             _connection = client.Connection;
@@ -30,8 +30,8 @@ public ObservableRepositoryBranchesClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<Branch> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -59,9 +59,9 @@ public IObservable<Branch> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Branch> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Branch>(ApiUrls.RepoBranches(owner, name), options);
         }
@@ -76,7 +76,7 @@ public IObservable<Branch> GetAll(string owner, string name, ApiOptions options)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Branch> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Branch>(ApiUrls.RepoBranches(repositoryId), options);
         }
@@ -93,9 +93,9 @@ public IObservable<Branch> GetAll(long repositoryId, ApiOptions options)
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get")]
         public IObservable<Branch> Get(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.Get(owner, name, branch).ToObservable();
         }
@@ -111,7 +111,7 @@ public IObservable<Branch> Get(string owner, string name, string branch)
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get")]
         public IObservable<Branch> Get(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.Get(repositoryId, branch).ToObservable();
         }
@@ -127,9 +127,9 @@ public IObservable<Branch> Get(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionSettings> GetBranchProtection(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetBranchProtection(owner, name, branch).ToObservable();
         }
@@ -144,7 +144,7 @@ public IObservable<BranchProtectionSettings> GetBranchProtection(string owner, s
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionSettings> GetBranchProtection(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetBranchProtection(repositoryId, branch).ToObservable();
         }
@@ -161,10 +161,10 @@ public IObservable<BranchProtectionSettings> GetBranchProtection(long repository
         /// <param name="update">Branch protection settings</param>
         public IObservable<BranchProtectionSettings> UpdateBranchProtection(string owner, string name, string branch, BranchProtectionSettingsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateBranchProtection(owner, name, branch, update).ToObservable();
         }
@@ -180,8 +180,8 @@ public IObservable<BranchProtectionSettings> UpdateBranchProtection(string owner
         /// <param name="update">Branch protection settings</param>
         public IObservable<BranchProtectionSettings> UpdateBranchProtection(long repositoryId, string branch, BranchProtectionSettingsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateBranchProtection(repositoryId, branch, update).ToObservable();
         }
@@ -197,9 +197,9 @@ public IObservable<BranchProtectionSettings> UpdateBranchProtection(long reposit
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> DeleteBranchProtection(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteBranchProtection(owner, name, branch).ToObservable();
         }
@@ -214,7 +214,7 @@ public IObservable<bool> DeleteBranchProtection(string owner, string name, strin
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> DeleteBranchProtection(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteBranchProtection(repositoryId, branch).ToObservable();
         }
@@ -230,9 +230,9 @@ public IObservable<bool> DeleteBranchProtection(long repositoryId, string branch
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetRequiredStatusChecks(owner, name, branch).ToObservable();
         }
@@ -247,7 +247,7 @@ public IObservable<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetRequiredStatusChecks(repositoryId, branch).ToObservable();
         }
@@ -264,10 +264,10 @@ public IObservable<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks
         /// <param name="update">Required status checks</param>
         public IObservable<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(string owner, string name, string branch, BranchProtectionRequiredStatusChecksUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateRequiredStatusChecks(owner, name, branch, update).ToObservable();
         }
@@ -283,8 +283,8 @@ public IObservable<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChe
         /// <param name="update">Required status checks</param>
         public IObservable<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(long repositoryId, string branch, BranchProtectionRequiredStatusChecksUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateRequiredStatusChecks(repositoryId, branch, update).ToObservable();
         }
@@ -300,9 +300,9 @@ public IObservable<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChe
         /// <param name="branch">The name of the branch</param>   
         public IObservable<bool> DeleteRequiredStatusChecks(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteRequiredStatusChecks(owner, name, branch).ToObservable();
         }
@@ -317,7 +317,7 @@ public IObservable<bool> DeleteRequiredStatusChecks(string owner, string name, s
         /// <param name="branch">The name of the branch</param> 
         public IObservable<bool> DeleteRequiredStatusChecks(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteRequiredStatusChecks(repositoryId, branch).ToObservable();
         }
@@ -362,9 +362,9 @@ public IObservable<string> GetRequiredStatusChecksContexts(long repositoryId, st
         /// <param name="branch">The name of the branch</param>
         public IObservable<string> GetAllRequiredStatusChecksContexts(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllRequiredStatusChecksContexts(owner, name, branch).ToObservable().SelectMany(x => x);
         }
@@ -379,7 +379,7 @@ public IObservable<string> GetAllRequiredStatusChecksContexts(string owner, stri
         /// <param name="branch">The name of the branch</param>
         public IObservable<string> GetAllRequiredStatusChecksContexts(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllRequiredStatusChecksContexts(repositoryId, branch).ToObservable().SelectMany(x => x);
         }
@@ -396,10 +396,10 @@ public IObservable<string> GetAllRequiredStatusChecksContexts(long repositoryId,
         /// <param name="contexts">The contexts to replace</param>
         public IObservable<string> UpdateRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.UpdateRequiredStatusChecksContexts(owner, name, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -415,8 +415,8 @@ public IObservable<string> UpdateRequiredStatusChecksContexts(string owner, stri
         /// <param name="contexts">The contexts to replace</param>
         public IObservable<string> UpdateRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.UpdateRequiredStatusChecksContexts(repositoryId, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -433,10 +433,10 @@ public IObservable<string> UpdateRequiredStatusChecksContexts(long repositoryId,
         /// <param name="contexts">The contexts to add</param>
         public IObservable<string> AddRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.AddRequiredStatusChecksContexts(owner, name, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -452,8 +452,8 @@ public IObservable<string> AddRequiredStatusChecksContexts(string owner, string
         /// <param name="contexts">The contexts to add</param>
         public IObservable<string> AddRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.AddRequiredStatusChecksContexts(repositoryId, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -470,10 +470,10 @@ public IObservable<string> AddRequiredStatusChecksContexts(long repositoryId, st
         /// <param name="contexts">The contexts to remove</param>
         public IObservable<string> DeleteRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.DeleteRequiredStatusChecksContexts(owner, name, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -489,8 +489,8 @@ public IObservable<string> DeleteRequiredStatusChecksContexts(string owner, stri
         /// <param name="contexts">The contexts to remove</param>
         public IObservable<string> DeleteRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return _client.DeleteRequiredStatusChecksContexts(repositoryId, branch, contexts).ToObservable().SelectMany(x => x);
         }
@@ -506,9 +506,9 @@ public IObservable<string> DeleteRequiredStatusChecksContexts(long repositoryId,
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionRequiredReviews> GetReviewEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetReviewEnforcement(owner, name, branch).ToObservable();
         }
@@ -523,7 +523,7 @@ public IObservable<BranchProtectionRequiredReviews> GetReviewEnforcement(string
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionRequiredReviews> GetReviewEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetReviewEnforcement(repositoryId, branch).ToObservable();
         }
@@ -540,9 +540,9 @@ public IObservable<BranchProtectionRequiredReviews> GetReviewEnforcement(long re
         /// <param name="update">The required pull request review settings</param>
         public IObservable<BranchProtectionRequiredReviews> UpdateReviewEnforcement(string owner, string name, string branch, BranchProtectionRequiredReviewsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateReviewEnforcement(owner, name, branch, update).ToObservable();
@@ -559,7 +559,7 @@ public IObservable<BranchProtectionRequiredReviews> UpdateReviewEnforcement(stri
         /// <param name="update">The required pull request review settings</param>
         public IObservable<BranchProtectionRequiredReviews> UpdateReviewEnforcement(long repositoryId, string branch, BranchProtectionRequiredReviewsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
             return _client.UpdateReviewEnforcement(repositoryId, branch, update).ToObservable();
@@ -576,9 +576,9 @@ public IObservable<BranchProtectionRequiredReviews> UpdateReviewEnforcement(long
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> RemoveReviewEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.RemoveReviewEnforcement(owner, name, branch).ToObservable();
         }
@@ -593,7 +593,7 @@ public IObservable<bool> RemoveReviewEnforcement(string owner, string name, stri
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> RemoveReviewEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.RemoveReviewEnforcement(repositoryId, branch).ToObservable();
         }
@@ -609,9 +609,9 @@ public IObservable<bool> RemoveReviewEnforcement(long repositoryId, string branc
         /// <param name="branch">The name of the branch</param>
         public IObservable<EnforceAdmins> GetAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAdminEnforcement(owner, name, branch).ToObservable();
         }
@@ -626,7 +626,7 @@ public IObservable<EnforceAdmins> GetAdminEnforcement(string owner, string name,
         /// <param name="branch">The name of the branch</param>
         public IObservable<EnforceAdmins> GetAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAdminEnforcement(repositoryId, branch).ToObservable();
         }
@@ -642,9 +642,9 @@ public IObservable<EnforceAdmins> GetAdminEnforcement(long repositoryId, string
         /// <param name="branch">The name of the branch</param>
         public IObservable<EnforceAdmins> AddAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.AddAdminEnforcement(owner, name, branch).ToObservable();
         }
@@ -659,7 +659,7 @@ public IObservable<EnforceAdmins> AddAdminEnforcement(string owner, string name,
         /// <param name="branch">The name of the branch</param>
         public IObservable<EnforceAdmins> AddAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.AddAdminEnforcement(repositoryId, branch).ToObservable();
         }
@@ -675,9 +675,9 @@ public IObservable<EnforceAdmins> AddAdminEnforcement(long repositoryId, string
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> RemoveAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.RemoveAdminEnforcement(owner, name, branch).ToObservable();
         }
@@ -692,7 +692,7 @@ public IObservable<bool> RemoveAdminEnforcement(string owner, string name, strin
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> RemoveAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.RemoveAdminEnforcement(repositoryId, branch).ToObservable();
         }
@@ -708,9 +708,9 @@ public IObservable<bool> RemoveAdminEnforcement(long repositoryId, string branch
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetProtectedBranchRestrictions(owner, name, branch).ToObservable();
         }
@@ -725,7 +725,7 @@ public IObservable<BranchProtectionPushRestrictions> GetProtectedBranchRestricti
         /// <param name="branch">The name of the branch</param>
         public IObservable<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetProtectedBranchRestrictions(repositoryId, branch).ToObservable();
         }
@@ -741,9 +741,9 @@ public IObservable<BranchProtectionPushRestrictions> GetProtectedBranchRestricti
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> DeleteProtectedBranchRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteProtectedBranchRestrictions(owner, name, branch).ToObservable();
         }
@@ -758,7 +758,7 @@ public IObservable<bool> DeleteProtectedBranchRestrictions(string owner, string
         /// <param name="branch">The name of the branch</param>
         public IObservable<bool> DeleteProtectedBranchRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.DeleteProtectedBranchRestrictions(repositoryId, branch).ToObservable();
         }
@@ -803,9 +803,9 @@ public IObservable<Team> GetProtectedBranchTeamRestrictions(long repositoryId, s
         /// <param name="branch">The name of the branch</param>
         public IObservable<Team> GetAllProtectedBranchTeamRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllProtectedBranchTeamRestrictions(owner, name, branch).ToObservable().SelectMany(x => x);
         }
@@ -820,7 +820,7 @@ public IObservable<Team> GetAllProtectedBranchTeamRestrictions(string owner, str
         /// <param name="branch">The name of the branch</param>
         public IObservable<Team> GetAllProtectedBranchTeamRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllProtectedBranchTeamRestrictions(repositoryId, branch).ToObservable().SelectMany(x => x);
         }
@@ -837,10 +837,10 @@ public IObservable<Team> GetAllProtectedBranchTeamRestrictions(long repositoryId
         /// <param name="teams">List of teams with push access</param>
         public IObservable<Team> UpdateProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.UpdateProtectedBranchTeamRestrictions(owner, name, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -856,8 +856,8 @@ public IObservable<Team> UpdateProtectedBranchTeamRestrictions(string owner, str
         /// <param name="teams">List of teams with push access</param>
         public IObservable<Team> UpdateProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.UpdateProtectedBranchTeamRestrictions(repositoryId, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -874,10 +874,10 @@ public IObservable<Team> UpdateProtectedBranchTeamRestrictions(long repositoryId
         /// <param name="teams">List of teams with push access</param>
         public IObservable<Team> AddProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.AddProtectedBranchTeamRestrictions(owner, name, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -893,8 +893,8 @@ public IObservable<Team> AddProtectedBranchTeamRestrictions(string owner, string
         /// <param name="teams">List of teams with push access</param>
         public IObservable<Team> AddProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.AddProtectedBranchTeamRestrictions(repositoryId, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -911,10 +911,10 @@ public IObservable<Team> AddProtectedBranchTeamRestrictions(long repositoryId, s
         /// <param name="teams">List of teams to remove</param>
         public IObservable<Team> DeleteProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.DeleteProtectedBranchTeamRestrictions(owner, name, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -930,8 +930,8 @@ public IObservable<Team> DeleteProtectedBranchTeamRestrictions(string owner, str
         /// <param name="teams">List of teams to remove</param>
         public IObservable<Team> DeleteProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return _client.DeleteProtectedBranchTeamRestrictions(repositoryId, branch, teams).ToObservable().SelectMany(x => x);
         }
@@ -977,9 +977,9 @@ public IObservable<User> GetProtectedBranchUserRestrictions(long repositoryId, s
         /// <param name="branch">The name of the branch</param>
         public IObservable<User> GetAllProtectedBranchUserRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllProtectedBranchUserRestrictions(owner, name, branch).ToObservable().SelectMany(x => x);
         }
@@ -994,7 +994,7 @@ public IObservable<User> GetAllProtectedBranchUserRestrictions(string owner, str
         /// <param name="branch">The name of the branch</param>
         public IObservable<User> GetAllProtectedBranchUserRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return _client.GetAllProtectedBranchUserRestrictions(repositoryId, branch).ToObservable().SelectMany(x => x);
         }
@@ -1011,10 +1011,10 @@ public IObservable<User> GetAllProtectedBranchUserRestrictions(long repositoryId
         /// <param name="users">List of users with push access</param>
         public IObservable<User> UpdateProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.UpdateProtectedBranchUserRestrictions(owner, name, branch, users).ToObservable().SelectMany(x => x);
         }
@@ -1030,8 +1030,8 @@ public IObservable<User> UpdateProtectedBranchUserRestrictions(string owner, str
         /// <param name="users">List of users with push access</param>
         public IObservable<User> UpdateProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.UpdateProtectedBranchUserRestrictions(repositoryId, branch, users).ToObservable().SelectMany(x => x);
         }
@@ -1048,10 +1048,10 @@ public IObservable<User> UpdateProtectedBranchUserRestrictions(long repositoryId
         /// <param name="users">List of users with push access to add</param>
         public IObservable<User> AddProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.AddProtectedBranchUserRestrictions(owner, name, branch, users).ToObservable().SelectMany(x => x);
         }
@@ -1067,8 +1067,8 @@ public IObservable<User> AddProtectedBranchUserRestrictions(string owner, string
         /// <param name="users">List of users with push access to add</param>
         public IObservable<User> AddProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.AddProtectedBranchUserRestrictions(repositoryId, branch, users).ToObservable().SelectMany(x => x);
         }
@@ -1085,10 +1085,10 @@ public IObservable<User> AddProtectedBranchUserRestrictions(long repositoryId, s
         /// <param name="users">List of users with push access to remove</param>
         public IObservable<User> DeleteProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.DeleteProtectedBranchUserRestrictions(owner, name, branch, users).ToObservable().SelectMany(x => x);
         }
@@ -1104,8 +1104,8 @@ public IObservable<User> DeleteProtectedBranchUserRestrictions(string owner, str
         /// <param name="users">List of users with push access to remove</param>
         public IObservable<User> DeleteProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return _client.DeleteProtectedBranchUserRestrictions(repositoryId, branch, users).ToObservable().SelectMany(x => x);
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryCommentsClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryCommentsClient.cs
index 7749df06e2..7258bfac6c 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryCommentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryCommentsClient.cs
@@ -18,7 +18,7 @@ public class ObservableRepositoryCommentsClient : IObservableRepositoryCommentsC
 
         public ObservableRepositoryCommentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Comment;
             _connection = client.Connection;
@@ -33,8 +33,8 @@ public ObservableRepositoryCommentsClient(IGitHubClient client)
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         public IObservable<CommitComment> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
@@ -58,8 +58,8 @@ public IObservable<CommitComment> Get(long repositoryId, int number)
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public IObservable<CommitComment> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -83,9 +83,9 @@ public IObservable<CommitComment> GetAllForRepository(long repositoryId)
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public IObservable<CommitComment> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitComment>(ApiUrls.CommitComments(owner, name), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -98,7 +98,7 @@ public IObservable<CommitComment> GetAllForRepository(string owner, string name,
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public IObservable<CommitComment> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitComment>(ApiUrls.CommitComments(repositoryId), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -112,9 +112,9 @@ public IObservable<CommitComment> GetAllForRepository(long repositoryId, ApiOpti
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public IObservable<CommitComment> GetAllForCommit(string owner, string name, string sha)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             return GetAllForCommit(owner, name, sha, ApiOptions.None);
         }
@@ -127,7 +127,7 @@ public IObservable<CommitComment> GetAllForCommit(string owner, string name, str
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public IObservable<CommitComment> GetAllForCommit(long repositoryId, string sha)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             return GetAllForCommit(repositoryId, sha, ApiOptions.None);
         }
@@ -142,10 +142,10 @@ public IObservable<CommitComment> GetAllForCommit(long repositoryId, string sha)
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public IObservable<CommitComment> GetAllForCommit(string owner, string name, string sha, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitComment>(ApiUrls.CommitComments(owner, name, sha), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -159,8 +159,8 @@ public IObservable<CommitComment> GetAllForCommit(string owner, string name, str
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public IObservable<CommitComment> GetAllForCommit(long repositoryId, string sha, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<CommitComment>(ApiUrls.CommitComments(repositoryId, sha), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -175,10 +175,10 @@ public IObservable<CommitComment> GetAllForCommit(long repositoryId, string sha,
         /// <remarks>http://developer.github.com/v3/repos/comments/#create-a-commit-comment</remarks>
         public IObservable<CommitComment> Create(string owner, string name, string sha, NewCommitComment newCommitComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(newCommitComment, "newCommitComment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(newCommitComment, nameof(newCommitComment));
 
             return _client.Create(owner, name, sha, newCommitComment).ToObservable();
         }
@@ -192,8 +192,8 @@ public IObservable<CommitComment> Create(string owner, string name, string sha,
         /// <remarks>http://developer.github.com/v3/repos/comments/#create-a-commit-comment</remarks>
         public IObservable<CommitComment> Create(long repositoryId, string sha, NewCommitComment newCommitComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(newCommitComment, "newCommitComment");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(newCommitComment, nameof(newCommitComment));
 
             return _client.Create(repositoryId, sha, newCommitComment).ToObservable();
         }
@@ -208,9 +208,9 @@ public IObservable<CommitComment> Create(long repositoryId, string sha, NewCommi
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         public IObservable<CommitComment> Update(string owner, string name, int number, string commentUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return _client.Update(owner, name, number, commentUpdate).ToObservable();
         }
@@ -224,7 +224,7 @@ public IObservable<CommitComment> Update(string owner, string name, int number,
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         public IObservable<CommitComment> Update(long repositoryId, int number, string commentUpdate)
         {
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return _client.Update(repositoryId, number, commentUpdate).ToObservable();
         }
@@ -238,8 +238,8 @@ public IObservable<CommitComment> Update(long repositoryId, int number, string c
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         public IObservable<Unit> Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs b/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs
index d37965c732..121bf5b4e4 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryCommitsClients.cs
@@ -17,7 +17,7 @@ public class ObservableRepositoryCommitsClient : IObservableRepositoryCommitsCli
 
         public ObservableRepositoryCommitsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _connection = client.Connection;
             _commit = client.Repository.Commit;
@@ -32,10 +32,10 @@ public ObservableRepositoryCommitsClient(IGitHubClient client)
         /// <param name="head">The reference to use as the head commit</param>
         public IObservable<CompareResult> Compare(string owner, string name, string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             return _commit.Compare(owner, name, @base, head).ToObservable();
         }
@@ -49,7 +49,7 @@ public IObservable<CompareResult> Compare(string owner, string name, string @bas
         public IObservable<CompareResult> Compare(long repositoryId, string @base, string head)
         {
             Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             return _commit.Compare(repositoryId, @base, head).ToObservable();
         }
@@ -62,9 +62,9 @@ public IObservable<CompareResult> Compare(long repositoryId, string @base, strin
         /// <param name="reference">The reference for the commit</param>
         public IObservable<GitHubCommit> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _commit.Get(owner, name, reference).ToObservable();
         }
@@ -76,7 +76,7 @@ public IObservable<GitHubCommit> Get(string owner, string name, string reference
         /// <param name="reference">The reference for the commit</param>
         public IObservable<GitHubCommit> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _commit.Get(repositoryId, reference).ToObservable();
         }
@@ -88,8 +88,8 @@ public IObservable<GitHubCommit> Get(long repositoryId, string reference)
         /// <param name="name">The name of the repository</param>
         public IObservable<GitHubCommit> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, new CommitRequest(), ApiOptions.None);
         }
@@ -111,9 +111,9 @@ public IObservable<GitHubCommit> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GitHubCommit> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAll(owner, name, new CommitRequest(), options);
         }
@@ -125,7 +125,7 @@ public IObservable<GitHubCommit> GetAll(string owner, string name, ApiOptions op
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GitHubCommit> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAll(repositoryId, new CommitRequest(), options);
         }
@@ -138,9 +138,9 @@ public IObservable<GitHubCommit> GetAll(long repositoryId, ApiOptions options)
         /// <param name="request">Used to filter list of commits returned</param>
         public IObservable<GitHubCommit> GetAll(string owner, string name, CommitRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(owner, name, request, ApiOptions.None);
         }
@@ -152,7 +152,7 @@ public IObservable<GitHubCommit> GetAll(string owner, string name, CommitRequest
         /// <param name="request">Used to filter list of commits returned</param>
         public IObservable<GitHubCommit> GetAll(long repositoryId, CommitRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(repositoryId, request, ApiOptions.None);
         }
@@ -166,10 +166,10 @@ public IObservable<GitHubCommit> GetAll(long repositoryId, CommitRequest request
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GitHubCommit> GetAll(string owner, string name, CommitRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<GitHubCommit>(ApiUrls.RepositoryCommits(owner, name), request.ToParametersDictionary(), options);
         }
@@ -182,8 +182,8 @@ public IObservable<GitHubCommit> GetAll(string owner, string name, CommitRequest
         /// <param name="options">Options for changing the API response</param>
         public IObservable<GitHubCommit> GetAll(long repositoryId, CommitRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<GitHubCommit>(ApiUrls.RepositoryCommits(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -196,9 +196,9 @@ public IObservable<GitHubCommit> GetAll(long repositoryId, CommitRequest request
         /// <param name="reference">The repository reference</param>
         public IObservable<string> GetSha1(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _commit.GetSha1(owner, name, reference).ToObservable();
         }
@@ -210,7 +210,7 @@ public IObservable<string> GetSha1(string owner, string name, string reference)
         /// <param name="reference">The repository reference</param>
         public IObservable<string> GetSha1(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _commit.GetSha1(repositoryId, reference).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryContentsClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryContentsClient.cs
index 5c4d4e8e18..f70804c824 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryContentsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryContentsClient.cs
@@ -21,7 +21,7 @@ public class ObservableRepositoryContentsClient : IObservableRepositoryContentsC
         /// <param name="client"></param>
         public ObservableRepositoryContentsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client;
         }
@@ -33,8 +33,8 @@ public ObservableRepositoryContentsClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<Readme> GetReadme(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Content.GetReadme(owner, name).ToObservable();
         }
@@ -55,8 +55,8 @@ public IObservable<Readme> GetReadme(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<string> GetReadmeHtml(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Content.GetReadmeHtml(owner, name).ToObservable();
         }
@@ -78,8 +78,8 @@ public IObservable<string> GetReadmeHtml(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<byte[]> GetArchive(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetArchive(owner, name, ArchiveFormat.Tarball);
         }
@@ -103,8 +103,8 @@ public IObservable<byte[]> GetArchive(long repositoryId)
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetArchive(owner, name, archiveFormat, string.Empty);
         }
@@ -130,9 +130,9 @@ public IObservable<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFo
         /// <param name="reference">A valid Git reference.</param>
         public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return GetArchive(owner, name, archiveFormat, reference, TimeSpan.FromMinutes(60));
         }
@@ -146,7 +146,7 @@ public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat a
         /// <param name="reference">A valid Git reference.</param>
         public IObservable<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat, string reference)
         {
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return GetArchive(repositoryId, archiveFormat, reference, TimeSpan.FromMinutes(60));
         }
@@ -162,10 +162,10 @@ public IObservable<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFo
         /// <param name="timeout"> Time span until timeout </param>
         public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
-            Ensure.GreaterThanZero(timeout, "timeout");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
+            Ensure.GreaterThanZero(timeout, nameof(timeout));
 
             return _client.Repository.Content.GetArchive(owner, name, archiveFormat, reference, timeout).ToObservable();
         }
@@ -180,8 +180,8 @@ public IObservable<byte[]> GetArchive(string owner, string name, ArchiveFormat a
         /// <param name="timeout"> Time span until timeout </param>
         public IObservable<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat, string reference, TimeSpan timeout)
         {
-            Ensure.GreaterThanZero(timeout, "timeout");
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.GreaterThanZero(timeout, nameof(timeout));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return _client.Repository.Content.GetArchive(repositoryId, archiveFormat, reference, timeout).ToObservable();
         }
@@ -197,9 +197,9 @@ public IObservable<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFo
         /// <param name="path">The content path</param>
         public IObservable<RepositoryContent> GetAllContents(string owner, string name, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             return _client
                 .Connection
@@ -216,7 +216,7 @@ public IObservable<RepositoryContent> GetAllContents(string owner, string name,
         /// <param name="path">The content path</param>
         public IObservable<RepositoryContent> GetAllContents(long repositoryId, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             return _client
                 .Connection
@@ -230,8 +230,8 @@ public IObservable<RepositoryContent> GetAllContents(long repositoryId, string p
         /// <param name="name">The name of the repository</param>
         public IObservable<RepositoryContent> GetAllContents(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client
                 .Connection
@@ -262,10 +262,10 @@ public IObservable<RepositoryContent> GetAllContents(long repositoryId)
         /// <param name="path">The content path</param>
         public IObservable<RepositoryContent> GetAllContentsByRef(string owner, string name, string reference, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             return _client.Connection.GetAndFlattenAllPages<RepositoryContent>(ApiUrls.RepositoryContent(owner, name, path, reference));
         }
@@ -282,8 +282,8 @@ public IObservable<RepositoryContent> GetAllContentsByRef(string owner, string n
         /// <param name="path">The content path</param>
         public IObservable<RepositoryContent> GetAllContentsByRef(long repositoryId, string reference, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             return _client.Connection.GetAndFlattenAllPages<RepositoryContent>(ApiUrls.RepositoryContent(repositoryId, path, reference));
         }
@@ -296,9 +296,9 @@ public IObservable<RepositoryContent> GetAllContentsByRef(long repositoryId, str
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository’s default branch (usually master)</param>
         public IObservable<RepositoryContent> GetAllContentsByRef(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Connection.GetAndFlattenAllPages<RepositoryContent>(ApiUrls.RepositoryContent(owner, name, string.Empty, reference));
         }
@@ -310,7 +310,7 @@ public IObservable<RepositoryContent> GetAllContentsByRef(string owner, string n
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository’s default branch (usually master)</param>
         public IObservable<RepositoryContent> GetAllContentsByRef(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Connection.GetAndFlattenAllPages<RepositoryContent>(ApiUrls.RepositoryContent(repositoryId, string.Empty, reference));
         }
@@ -324,10 +324,10 @@ public IObservable<RepositoryContent> GetAllContentsByRef(long repositoryId, str
         /// <param name="request">Information about the file to create</param>
         public IObservable<RepositoryContentChangeSet> CreateFile(string owner, string name, string path, CreateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.CreateFile(owner, name, path, request).ToObservable();
         }
@@ -340,8 +340,8 @@ public IObservable<RepositoryContentChangeSet> CreateFile(string owner, string n
         /// <param name="request">Information about the file to create</param>
         public IObservable<RepositoryContentChangeSet> CreateFile(long repositoryId, string path, CreateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.CreateFile(repositoryId, path, request).ToObservable();
         }
@@ -355,10 +355,10 @@ public IObservable<RepositoryContentChangeSet> CreateFile(long repositoryId, str
         /// <param name="request">Information about the file to update</param>
         public IObservable<RepositoryContentChangeSet> UpdateFile(string owner, string name, string path, UpdateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.UpdateFile(owner, name, path, request).ToObservable();
         }
@@ -371,8 +371,8 @@ public IObservable<RepositoryContentChangeSet> UpdateFile(string owner, string n
         /// <param name="request">Information about the file to update</param>
         public IObservable<RepositoryContentChangeSet> UpdateFile(long repositoryId, string path, UpdateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.UpdateFile(repositoryId, path, request).ToObservable();
         }
@@ -386,10 +386,10 @@ public IObservable<RepositoryContentChangeSet> UpdateFile(long repositoryId, str
         /// <param name="request">Information about the file to delete</param>
         public IObservable<Unit> DeleteFile(string owner, string name, string path, DeleteFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.DeleteFile(owner, name, path, request).ToObservable();
         }
@@ -402,8 +402,8 @@ public IObservable<Unit> DeleteFile(string owner, string name, string path, Dele
         /// <param name="request">Information about the file to delete</param>
         public IObservable<Unit> DeleteFile(long repositoryId, string path, DeleteFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return _client.Repository.Content.DeleteFile(repositoryId, path, request).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryDeployKeysClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryDeployKeysClient.cs
index 6991207dc9..3effca62ad 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryDeployKeysClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryDeployKeysClient.cs
@@ -18,7 +18,7 @@ public class ObservableRepositoryDeployKeysClient : IObservableRepositoryDeployK
 
         public ObservableRepositoryDeployKeysClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.DeployKeys;
             _connection = client.Connection;
@@ -35,8 +35,8 @@ public ObservableRepositoryDeployKeysClient(IGitHubClient client)
         /// <param name="number">The id of the deploy key.</param>
         public IObservable<DeployKey> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, number).ToObservable();
         }
@@ -64,8 +64,8 @@ public IObservable<DeployKey> Get(long repositoryId, int number)
         /// <param name="name">The name of the repository.</param>
         public IObservable<DeployKey> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -93,9 +93,9 @@ public IObservable<DeployKey> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<DeployKey> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<DeployKey>(ApiUrls.RepositoryDeployKeys(owner, name), options);
         }
@@ -110,7 +110,7 @@ public IObservable<DeployKey> GetAll(string owner, string name, ApiOptions optio
         /// <param name="options">Options for changing the API response</param>
         public IObservable<DeployKey> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<DeployKey>(ApiUrls.RepositoryDeployKeys(repositoryId), options);
         }
@@ -126,9 +126,9 @@ public IObservable<DeployKey> GetAll(long repositoryId, ApiOptions options)
         /// <param name="newDeployKey">The deploy key to create for the repository.</param>
         public IObservable<DeployKey> Create(string owner, string name, NewDeployKey newDeployKey)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newDeployKey, "newDeployKey");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newDeployKey, nameof(newDeployKey));
 
 
             if (string.IsNullOrWhiteSpace(newDeployKey.Title))
@@ -150,7 +150,7 @@ public IObservable<DeployKey> Create(string owner, string name, NewDeployKey new
         /// <param name="newDeployKey">The deploy key to create for the repository.</param>
         public IObservable<DeployKey> Create(long repositoryId, NewDeployKey newDeployKey)
         {
-            Ensure.ArgumentNotNull(newDeployKey, "newDeployKey");
+            Ensure.ArgumentNotNull(newDeployKey, nameof(newDeployKey));
 
 
             if (string.IsNullOrWhiteSpace(newDeployKey.Title))
@@ -173,8 +173,8 @@ public IObservable<DeployKey> Create(long repositoryId, NewDeployKey newDeployKe
         /// <param name="number">The id of the deploy key to delete.</param>
         public IObservable<Unit> Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, number).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs
index cb3deb730c..ebc7ebd1a8 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryForksClient.cs
@@ -21,7 +21,7 @@ public class ObservableRepositoryForksClient : IObservableRepositoryForksClient
         /// <param name="client"></param>
         public ObservableRepositoryForksClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Forks;
             _connection = client.Connection;
@@ -37,8 +37,8 @@ public ObservableRepositoryForksClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<Repository> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -66,9 +66,9 @@ public IObservable<Repository> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Repository> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.RepositoryForks(owner, name), options);
         }
@@ -83,7 +83,7 @@ public IObservable<Repository> GetAll(string owner, string name, ApiOptions opti
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Repository> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.RepositoryForks(repositoryId), options);
         }
@@ -99,9 +99,9 @@ public IObservable<Repository> GetAll(long repositoryId, ApiOptions options)
         /// <param name="request">Used to request and filter a list of repository forks</param>
         public IObservable<Repository> GetAll(string owner, string name, RepositoryForksListRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(owner, name, request, ApiOptions.None);
         }
@@ -116,7 +116,7 @@ public IObservable<Repository> GetAll(string owner, string name, RepositoryForks
         /// <param name="request">Used to request and filter a list of repository forks</param>
         public IObservable<Repository> GetAll(long repositoryId, RepositoryForksListRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(repositoryId, request, ApiOptions.None);
         }
@@ -133,10 +133,10 @@ public IObservable<Repository> GetAll(long repositoryId, RepositoryForksListRequ
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Repository> GetAll(string owner, string name, RepositoryForksListRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options);
         }
@@ -152,8 +152,8 @@ public IObservable<Repository> GetAll(string owner, string name, RepositoryForks
         /// <param name="options">Options for changing the API response</param>
         public IObservable<Repository> GetAll(long repositoryId, RepositoryForksListRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -169,9 +169,9 @@ public IObservable<Repository> GetAll(long repositoryId, RepositoryForksListRequ
         /// <param name="fork">Used to fork a repository</param>
         public IObservable<Repository> Create(string owner, string name, NewRepositoryFork fork)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(fork, "fork");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(fork, nameof(fork));
 
             return _client.Create(owner, name, fork).ToObservable();
         }
@@ -186,7 +186,7 @@ public IObservable<Repository> Create(string owner, string name, NewRepositoryFo
         /// <param name="fork">Used to fork a repository</param>
         public IObservable<Repository> Create(long repositoryId, NewRepositoryFork fork)
         {
-            Ensure.ArgumentNotNull(fork, "fork");
+            Ensure.ArgumentNotNull(fork, nameof(fork));
 
             return _client.Create(repositoryId, fork).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryHooksClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryHooksClient.cs
index 5b0268c0db..5e7ee9c893 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryHooksClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryHooksClient.cs
@@ -18,7 +18,7 @@ public class ObservableRepositoryHooksClient : IObservableRepositoryHooksClient
 
         public ObservableRepositoryHooksClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Hooks;
             _connection = client.Connection;
@@ -32,8 +32,8 @@ public ObservableRepositoryHooksClient(IGitHubClient client)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -57,9 +57,9 @@ public IObservable<RepositoryHook> GetAll(long repositoryId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryHook>(ApiUrls.RepositoryHooks(owner, name), options);
         }
@@ -72,7 +72,7 @@ public IObservable<RepositoryHook> GetAll(string owner, string name, ApiOptions
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryHook>(ApiUrls.RepositoryHooks(repositoryId), options);
         }
@@ -86,8 +86,8 @@ public IObservable<RepositoryHook> GetAll(long repositoryId, ApiOptions options)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#get-single-hook">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> Get(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name, hookId).ToObservable();
         }
@@ -112,9 +112,9 @@ public IObservable<RepositoryHook> Get(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#create-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> Create(string owner, string name, NewRepositoryHook hook)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return _client.Create(owner, name, hook).ToObservable();
         }
@@ -127,7 +127,7 @@ public IObservable<RepositoryHook> Create(string owner, string name, NewReposito
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#create-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> Create(long repositoryId, NewRepositoryHook hook)
         {
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return _client.Create(repositoryId, hook).ToObservable();
         }
@@ -142,9 +142,9 @@ public IObservable<RepositoryHook> Create(long repositoryId, NewRepositoryHook h
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> Edit(string owner, string name, int hookId, EditRepositoryHook hook)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return _client.Edit(owner, name, hookId, hook).ToObservable();
         }
@@ -158,7 +158,7 @@ public IObservable<RepositoryHook> Edit(string owner, string name, int hookId, E
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<RepositoryHook> Edit(long repositoryId, int hookId, EditRepositoryHook hook)
         {
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return _client.Edit(repositoryId, hookId, hook).ToObservable();
         }
@@ -174,8 +174,8 @@ public IObservable<RepositoryHook> Edit(long repositoryId, int hookId, EditRepos
         /// is not subscribed to push events, the server will respond with 204 but no test POST will be generated.</remarks>
         public IObservable<Unit> Test(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Test(owner, name, hookId).ToObservable();
         }
@@ -202,8 +202,8 @@ public IObservable<Unit> Test(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<Unit> Ping(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Ping(owner, name, hookId).ToObservable();
         }
@@ -228,8 +228,8 @@ public IObservable<Unit> Ping(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#delete-a-hook">API documentation</a> for more information.</remarks>
         public IObservable<Unit> Delete(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Delete(owner, name, hookId).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryInvitationsClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryInvitationsClient.cs
index 25e565fb9f..381ec24e96 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryInvitationsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryInvitationsClient.cs
@@ -13,7 +13,7 @@ public class ObservableRepositoryInvitationsClient : IObservableRepositoryInvita
 
         public ObservableRepositoryInvitationsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Invitation;
             _connection = client.Connection;
@@ -67,7 +67,7 @@ public IObservable<bool> Delete(long repositoryId, int invitationId)
         /// <param name="permissions">The permission to set.</param>
         public IObservable<RepositoryInvitation> Edit(long repositoryId, int invitationId, InvitationUpdate permissions)
         {
-            Ensure.ArgumentNotNull(permissions, "persmissions");
+            Ensure.ArgumentNotNull(permissions, nameof(permissions));
 
             return _client.Edit(repositoryId, invitationId, permissions).ToObservable();
         }
@@ -92,7 +92,7 @@ public IObservable<RepositoryInvitation> GetAllForCurrent()
         /// <param name="options">Options for changing the API response</param>        
         public IObservable<RepositoryInvitation> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
             return _connection.GetAndFlattenAllPages<RepositoryInvitation>(ApiUrls.UserInvitations(), null, AcceptHeaders.InvitationsApiPreview, options);
         }
 
@@ -118,7 +118,7 @@ public IObservable<RepositoryInvitation> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public IObservable<RepositoryInvitation> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
             return _connection.GetAndFlattenAllPages<RepositoryInvitation>(ApiUrls.RepositoryInvitations(repositoryId), null, AcceptHeaders.InvitationsApiPreview, options);
         }
     }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryPagesClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryPagesClient.cs
index e87f781c08..fda86ac391 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryPagesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryPagesClient.cs
@@ -18,7 +18,7 @@ public class ObservableRepositoryPagesClient : IObservableRepositoryPagesClient
 
         public ObservableRepositoryPagesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Page;
             _connection = client.Connection;
@@ -35,8 +35,8 @@ public ObservableRepositoryPagesClient(IGitHubClient client)
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get")]
         public IObservable<Page> Get(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Get(owner, name).ToObservable();
         }
@@ -63,8 +63,8 @@ public IObservable<Page> Get(long repositoryId)
         /// </remarks>
         public IObservable<PagesBuild> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -92,9 +92,9 @@ public IObservable<PagesBuild> GetAll(long repositoryId)
         /// </remarks>
         public IObservable<PagesBuild> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PagesBuild>(ApiUrls.RepositoryPageBuilds(owner, name), options);
         }
@@ -109,7 +109,7 @@ public IObservable<PagesBuild> GetAll(string owner, string name, ApiOptions opti
         /// </remarks>
         public IObservable<PagesBuild> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<PagesBuild>(ApiUrls.RepositoryPageBuilds(repositoryId), options);
         }
@@ -124,8 +124,8 @@ public IObservable<PagesBuild> GetAll(long repositoryId, ApiOptions options)
         /// </remarks>
         public IObservable<PagesBuild> GetLatest(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.GetLatest(owner, name).ToObservable();
         }
@@ -152,8 +152,8 @@ public IObservable<PagesBuild> GetLatest(long repositoryId)
         /// </remarks>
         public IObservable<PagesBuild> RequestPageBuild(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.RequestPageBuild(owner, name).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableRepositoryTrafficClient.cs b/Octokit.Reactive/Clients/ObservableRepositoryTrafficClient.cs
index b37373ce75..d714b88665 100644
--- a/Octokit.Reactive/Clients/ObservableRepositoryTrafficClient.cs
+++ b/Octokit.Reactive/Clients/ObservableRepositoryTrafficClient.cs
@@ -10,7 +10,7 @@ public class ObservableRepositoryTrafficClient : IObservableRepositoryTrafficCli
 
         public ObservableRepositoryTrafficClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Repository.Traffic;
         }
@@ -56,8 +56,8 @@ public IObservable<RepositoryTrafficPath> GetAllPaths(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<RepositoryTrafficPath> GetAllPaths(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.GetAllPaths(owner, name).ToObservable().SelectMany(x => x);
         }
@@ -103,8 +103,8 @@ public IObservable<RepositoryTrafficReferrer> GetAllReferrers(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<RepositoryTrafficReferrer> GetAllReferrers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.GetAllReferrers(owner, name).ToObservable().SelectMany(x => x);
         }
@@ -117,7 +117,7 @@ public IObservable<RepositoryTrafficReferrer> GetAllReferrers(string owner, stri
         /// <param name="per">Breakdown per day or week</param>
         public IObservable<RepositoryTrafficCloneSummary> GetClones(long repositoryId, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return _client.GetClones(repositoryId, per).ToObservable();
         }
@@ -131,9 +131,9 @@ public IObservable<RepositoryTrafficCloneSummary> GetClones(long repositoryId, R
         /// <param name="per">Breakdown per day or week</param>
         public IObservable<RepositoryTrafficCloneSummary> GetClones(string owner, string name, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return _client.GetClones(owner, name, per).ToObservable();
         }
@@ -146,7 +146,7 @@ public IObservable<RepositoryTrafficCloneSummary> GetClones(string owner, string
         /// <param name="per">Breakdown per day or week</param>
         public IObservable<RepositoryTrafficViewSummary> GetViews(long repositoryId, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return _client.GetViews(repositoryId, per).ToObservable();
         }
@@ -160,9 +160,9 @@ public IObservable<RepositoryTrafficViewSummary> GetViews(long repositoryId, Rep
         /// <param name="per">Breakdown per day or week</param>
         public IObservable<RepositoryTrafficViewSummary> GetViews(string owner, string name, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return _client.GetViews(owner, name, per).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableSearchClient.cs b/Octokit.Reactive/Clients/ObservableSearchClient.cs
index 1bdf00458d..3505de266b 100644
--- a/Octokit.Reactive/Clients/ObservableSearchClient.cs
+++ b/Octokit.Reactive/Clients/ObservableSearchClient.cs
@@ -12,7 +12,7 @@ public class ObservableSearchClient : IObservableSearchClient
 
         public ObservableSearchClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Search;
         }
@@ -25,7 +25,7 @@ public ObservableSearchClient(IGitHubClient client)
         /// <returns>List of repositories</returns>
         public IObservable<SearchRepositoryResult> SearchRepo(SearchRepositoriesRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return _client.SearchRepo(search).ToObservable();
         }
 
@@ -37,7 +37,7 @@ public IObservable<SearchRepositoryResult> SearchRepo(SearchRepositoriesRequest
         /// <returns>List of users</returns>
         public IObservable<SearchUsersResult> SearchUsers(SearchUsersRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return _client.SearchUsers(search).ToObservable();
         }
 
@@ -49,7 +49,7 @@ public IObservable<SearchUsersResult> SearchUsers(SearchUsersRequest search)
         /// <returns>List of issues</returns>
         public IObservable<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return _client.SearchIssues(search).ToObservable();
         }
 
@@ -61,7 +61,7 @@ public IObservable<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
         /// <returns>List of files</returns>
         public IObservable<SearchCodeResult> SearchCode(SearchCodeRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return _client.SearchCode(search).ToObservable();
         }
     }
diff --git a/Octokit.Reactive/Clients/ObservableStarredClient.cs b/Octokit.Reactive/Clients/ObservableStarredClient.cs
index 2a157a262f..f1c60e932b 100644
--- a/Octokit.Reactive/Clients/ObservableStarredClient.cs
+++ b/Octokit.Reactive/Clients/ObservableStarredClient.cs
@@ -17,7 +17,7 @@ public class ObservableStarredClient : IObservableStarredClient
 
         public ObservableStarredClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Activity.Starring;
             _connection = client.Connection;
@@ -31,8 +31,8 @@ public ObservableStarredClient(IGitHubClient client)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllStargazers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllStargazers(owner, name, ApiOptions.None);
         }
@@ -56,9 +56,9 @@ public IObservable<User> GetAllStargazers(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllStargazers(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Stargazers(owner, name), options);
         }
@@ -71,7 +71,7 @@ public IObservable<User> GetAllStargazers(string owner, string name, ApiOptions
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllStargazers(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Stargazers(repositoryId), options);
         }
@@ -84,8 +84,8 @@ public IObservable<User> GetAllStargazers(long repositoryId, ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<UserStar> GetAllStargazersWithTimestamps(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllStargazersWithTimestamps(owner, name, ApiOptions.None);
         }
@@ -109,9 +109,9 @@ public IObservable<UserStar> GetAllStargazersWithTimestamps(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<UserStar> GetAllStargazersWithTimestamps(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<UserStar>(ApiUrls.Stargazers(owner, name), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -124,7 +124,7 @@ public IObservable<UserStar> GetAllStargazersWithTimestamps(string owner, string
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<UserStar> GetAllStargazersWithTimestamps(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<UserStar>(ApiUrls.Stargazers(repositoryId), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -144,7 +144,7 @@ public IObservable<Repository> GetAllForCurrent()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Starred(), options);
         }
@@ -164,7 +164,7 @@ public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryStar>(ApiUrls.Starred(), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -177,7 +177,7 @@ public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(ApiOptions opt
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public IObservable<Repository> GetAllForCurrent(StarredRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -190,8 +190,8 @@ public IObservable<Repository> GetAllForCurrent(StarredRequest request)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForCurrent(StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Starred(), request.ToParametersDictionary(), options);
         }
@@ -204,7 +204,7 @@ public IObservable<Repository> GetAllForCurrent(StarredRequest request, ApiOptio
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(StarredRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrentWithTimestamps(request, ApiOptions.None);
         }
@@ -217,8 +217,8 @@ public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(StarredRequest
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryStar>(ApiUrls.Starred(), request.ToParametersDictionary(), AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -230,7 +230,7 @@ public IObservable<RepositoryStar> GetAllForCurrentWithTimestamps(StarredRequest
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -243,8 +243,8 @@ public IObservable<Repository> GetAllForUser(string user)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.StarredByUser(user), options);
         }
@@ -256,7 +256,7 @@ public IObservable<Repository> GetAllForUser(string user, ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUserWithTimestamps(user, ApiOptions.None);
         }
@@ -269,8 +269,8 @@ public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryStar>(ApiUrls.StarredByUser(user), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -284,8 +284,8 @@ public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, ApiO
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public IObservable<Repository> GetAllForUser(string user, StarredRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForUser(user, request, ApiOptions.None);
         }
@@ -299,9 +299,9 @@ public IObservable<Repository> GetAllForUser(string user, StarredRequest request
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForUser(string user, StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.StarredByUser(user), request.ToParametersDictionary(), options);
         }
@@ -315,8 +315,8 @@ public IObservable<Repository> GetAllForUser(string user, StarredRequest request
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, StarredRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForUserWithTimestamps(user, request, ApiOptions.None);
         }
@@ -330,9 +330,9 @@ public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, Star
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<RepositoryStar>(ApiUrls.StarredByUser(user), request.ToParametersDictionary(), AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -345,8 +345,8 @@ public IObservable<RepositoryStar> GetAllForUserWithTimestamps(string user, Star
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public IObservable<bool> CheckStarred(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.CheckStarred(owner, name).ToObservable();
         }
@@ -358,8 +358,8 @@ public IObservable<bool> CheckStarred(string owner, string name)
         /// <param name="name">The name of the repository to star</param>
         public IObservable<bool> StarRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.StarRepo(owner, name).ToObservable();
         }
@@ -371,8 +371,8 @@ public IObservable<bool> StarRepo(string owner, string name)
         /// <param name="name">The name of the repository to unstar</param>
         public IObservable<bool> RemoveStarFromRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.RemoveStarFromRepo(owner, name).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableStatisticsClient.cs b/Octokit.Reactive/Clients/ObservableStatisticsClient.cs
index 3006e4d3bf..e1f3b3bf88 100644
--- a/Octokit.Reactive/Clients/ObservableStatisticsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableStatisticsClient.cs
@@ -16,7 +16,7 @@ public class ObservableStatisticsClient : IObservableStatisticsClient
 
         public ObservableStatisticsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client;
         }
@@ -28,8 +28,8 @@ public ObservableStatisticsClient(IGitHubClient client)
         /// <param name="name">The name of the repository</param>
         public IObservable<IEnumerable<Contributor>> GetContributors(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Statistics.GetContributors(owner, name).ToObservable();
         }
@@ -50,8 +50,8 @@ public IObservable<IEnumerable<Contributor>> GetContributors(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<CommitActivity> GetCommitActivity(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Statistics.GetCommitActivity(owner, name).ToObservable();
         }
@@ -72,8 +72,8 @@ public IObservable<CommitActivity> GetCommitActivity(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<CodeFrequency> GetCodeFrequency(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Statistics.GetCodeFrequency(owner, name).ToObservable();
         }
@@ -94,8 +94,8 @@ public IObservable<CodeFrequency> GetCodeFrequency(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<Participation> GetParticipation(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Statistics.GetParticipation(owner, name).ToObservable();
         }
@@ -116,8 +116,8 @@ public IObservable<Participation> GetParticipation(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public IObservable<PunchCard> GetPunchCard(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.Repository.Statistics.GetPunchCard(owner, name).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableTagsClient.cs b/Octokit.Reactive/Clients/ObservableTagsClient.cs
index 0002e20c93..d8eeddb9a2 100644
--- a/Octokit.Reactive/Clients/ObservableTagsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableTagsClient.cs
@@ -15,7 +15,7 @@ public class ObservableTagsClient : IObservableTagsClient
 
         public ObservableTagsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Git.Tag;
         }
@@ -31,9 +31,9 @@ public ObservableTagsClient(IGitHubClient client)
         /// <param name="reference">Tha sha reference of the tag</param>
         public IObservable<GitTag> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(owner, name, reference).ToObservable();
         }
@@ -48,7 +48,7 @@ public IObservable<GitTag> Get(string owner, string name, string reference)
         /// <param name="reference">Tha sha reference of the tag</param>
         public IObservable<GitTag> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(repositoryId, reference).ToObservable();
         }
@@ -64,9 +64,9 @@ public IObservable<GitTag> Get(long repositoryId, string reference)
         /// <param name="tag">The tag to create</param>
         public IObservable<GitTag> Create(string owner, string name, NewTag tag)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(tag, "tag");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(tag, nameof(tag));
 
             return _client.Create(owner, name, tag).ToObservable();
         }
@@ -81,7 +81,7 @@ public IObservable<GitTag> Create(string owner, string name, NewTag tag)
         /// <param name="tag">The tag to create</param>
         public IObservable<GitTag> Create(long repositoryId, NewTag tag)
         {
-            Ensure.ArgumentNotNull(tag, "tag");
+            Ensure.ArgumentNotNull(tag, nameof(tag));
 
             return _client.Create(repositoryId, tag).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableTeamsClient.cs b/Octokit.Reactive/Clients/ObservableTeamsClient.cs
index 4739ce0c88..47d438ae1e 100644
--- a/Octokit.Reactive/Clients/ObservableTeamsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableTeamsClient.cs
@@ -22,7 +22,7 @@ public class ObservableTeamsClient : IObservableTeamsClient
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
         public ObservableTeamsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
             _connection = client.Connection;
             _client = client.Organization.Team;
         }
@@ -47,7 +47,7 @@ public IObservable<Team> Get(int id)
         /// <returns>A list of the orgs's teams <see cref="Team"/>s.</returns>
         public IObservable<Team> GetAll(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, ApiOptions.None);
         }
@@ -61,8 +61,8 @@ public IObservable<Team> GetAll(string org)
         /// <returns>A list of the orgs's teams <see cref="Team"/>s.</returns>
         public IObservable<Team> GetAll(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Team>(ApiUrls.OrganizationTeams(org), null, AcceptHeaders.NestedTeamsPreview, options);
         }
@@ -85,7 +85,7 @@ public IObservable<Team> GetAllForCurrent()
         /// <returns>A list of the user's <see cref="Team"/>s.</returns>
         public IObservable<Team> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Team>(ApiUrls.UserTeams(), null, AcceptHeaders.NestedTeamsPreview, options);
         }
@@ -112,7 +112,7 @@ public IObservable<Team> GetAllChildTeams(int id)
         /// <param name="options">Options to change API behaviour.</param>
         public IObservable<Team> GetAllChildTeams(int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Team>(ApiUrls.TeamChildTeams(id), null, AcceptHeaders.NestedTeamsPreview, options);
         }
@@ -143,7 +143,7 @@ public IObservable<User> GetAllMembers(int id)
         /// <returns>A list of the team's member <see cref="User"/>s.</returns>
         public IObservable<User> GetAllMembers(int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.TeamMembers(id), null, AcceptHeaders.NestedTeamsPreview, options);
         }
@@ -187,8 +187,8 @@ public IObservable<User> GetAllMembers(int id, TeamMembersRequest request, ApiOp
         /// <returns>Newly created <see cref="Team"/></returns>
         public IObservable<Team> Create(string org, NewTeam team)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(team, "team");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(team, nameof(team));
 
             return _client.Create(org, team).ToObservable();
         }
@@ -200,7 +200,7 @@ public IObservable<Team> Create(string org, NewTeam team)
         /// <returns>Updated <see cref="Team"/></returns>
         public IObservable<Team> Update(int id, UpdateTeam team)
         {
-            Ensure.ArgumentNotNull(team, "team");
+            Ensure.ArgumentNotNull(team, nameof(team));
 
             return _client.Update(id, team).ToObservable();
         }
@@ -226,7 +226,7 @@ public IObservable<Unit> Delete(int id)
         [Obsolete("Please use AddOrEditMembership instead")]
         public IObservable<TeamMembership> AddMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.AddMembership(id, login).ToObservable();
         }
@@ -259,7 +259,7 @@ public IObservable<TeamMembershipDetails> AddOrEditMembership(int id, string log
         /// <returns><see langword="true"/> if the user was removed from the team; <see langword="false"/> otherwise.</returns>
         public IObservable<bool> RemoveMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.RemoveMembership(id, login).ToObservable();
         }
@@ -273,7 +273,7 @@ public IObservable<bool> RemoveMembership(int id, string login)
         [Obsolete("Please use GetMembershipDetails instead")]
         public IObservable<TeamMembership> GetMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.GetMembership(id, login).ToObservable();
         }
@@ -290,7 +290,7 @@ public IObservable<TeamMembership> GetMembership(int id, string login)
         /// <param name="login">The user to check.</param>
         public IObservable<TeamMembershipDetails> GetMembershipDetails(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return _client.GetMembershipDetails(id, login).ToObservable();
         }
@@ -314,7 +314,7 @@ public IObservable<Repository> GetAllRepositories(int id)
         /// <returns>The team's repositories</returns>
         public IObservable<Repository> GetAllRepositories(int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.TeamRepositories(id), null, AcceptHeaders.NestedTeamsPreview, options);
         }
@@ -332,8 +332,8 @@ public IObservable<Repository> GetAllRepositories(int id, ApiOptions options)
         /// <returns><see langword="true"/> if the repository was added to the team; <see langword="false"/> otherwise.</returns>
         public IObservable<bool> AddRepository(int id, string organization, string repoName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             return _client.AddRepository(id, organization, repoName).ToObservable();
         }
@@ -352,8 +352,8 @@ public IObservable<bool> AddRepository(int id, string organization, string repoN
         /// <returns><see langword="true"/> if the repository was added to the team; <see langword="false"/> otherwise.</returns>
         public IObservable<bool> AddRepository(int id, string organization, string repoName, RepositoryPermissionRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             return _client.AddRepository(id, organization, repoName, permission).ToObservable();
         }
@@ -365,8 +365,8 @@ public IObservable<bool> AddRepository(int id, string organization, string repoN
         /// <returns></returns>
         public IObservable<bool> RemoveRepository(int id, string organization, string repoName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             return _client.RemoveRepository(id, organization, repoName).ToObservable();
         }
@@ -383,8 +383,8 @@ public IObservable<bool> RemoveRepository(int id, string organization, string re
         /// <returns><see langword="true"/> if the repository is managed by the given team; <see langword="false"/> otherwise.</returns>
         public IObservable<bool> IsRepositoryManagedByTeam(int id, string owner, string repo)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
             return _client.IsRepositoryManagedByTeam(id, owner, repo).ToObservable();
         }
 
diff --git a/Octokit.Reactive/Clients/ObservableTreesClient.cs b/Octokit.Reactive/Clients/ObservableTreesClient.cs
index 7467f3224f..5b7f3b0fbe 100644
--- a/Octokit.Reactive/Clients/ObservableTreesClient.cs
+++ b/Octokit.Reactive/Clients/ObservableTreesClient.cs
@@ -15,7 +15,7 @@ public class ObservableTreesClient : IObservableTreesClient
 
         public ObservableTreesClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Git.Tree;
         }
@@ -31,9 +31,9 @@ public ObservableTreesClient(IGitHubClient client)
         /// <param name="reference">The SHA that references the tree</param>
         public IObservable<TreeResponse> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(owner, name, reference).ToObservable();
         }
@@ -48,7 +48,7 @@ public IObservable<TreeResponse> Get(string owner, string name, string reference
         /// <param name="reference">The SHA that references the tree</param>
         public IObservable<TreeResponse> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.Get(repositoryId, reference).ToObservable();
         }
@@ -64,9 +64,9 @@ public IObservable<TreeResponse> Get(long repositoryId, string reference)
         /// <param name="reference">The SHA that references the tree</param>
         public IObservable<TreeResponse> GetRecursive(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.GetRecursive(owner, name, reference).ToObservable();
         }
@@ -81,7 +81,7 @@ public IObservable<TreeResponse> GetRecursive(string owner, string name, string
         /// <param name="reference">The SHA that references the tree</param>
         public IObservable<TreeResponse> GetRecursive(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return _client.GetRecursive(repositoryId, reference).ToObservable();
         }
@@ -97,9 +97,9 @@ public IObservable<TreeResponse> GetRecursive(long repositoryId, string referenc
         /// <param name="newTree">The value of the new tree</param>
         public IObservable<TreeResponse> Create(string owner, string name, NewTree newTree)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newTree, "newTree");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newTree, nameof(newTree));
 
             return _client.Create(owner, name, newTree).ToObservable();
         }
@@ -114,7 +114,7 @@ public IObservable<TreeResponse> Create(string owner, string name, NewTree newTr
         /// <param name="newTree">The value of the new tree</param>
         public IObservable<TreeResponse> Create(long repositoryId, NewTree newTree)
         {
-            Ensure.ArgumentNotNull(newTree, "newTree");
+            Ensure.ArgumentNotNull(newTree, nameof(newTree));
 
             return _client.Create(repositoryId, newTree).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableUserAdministrationClient.cs b/Octokit.Reactive/Clients/ObservableUserAdministrationClient.cs
index b5f8645b43..622813df8e 100644
--- a/Octokit.Reactive/Clients/ObservableUserAdministrationClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUserAdministrationClient.cs
@@ -23,7 +23,7 @@ public class ObservableUserAdministrationClient : IObservableUserAdministrationC
         /// <param name="client">An <see cref="IGitHubClient" /> used to make the requests</param>
         public ObservableUserAdministrationClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User.Administration;
             _connection = client.Connection;
diff --git a/Octokit.Reactive/Clients/ObservableUserEmailsClient.cs b/Octokit.Reactive/Clients/ObservableUserEmailsClient.cs
index 96076c307e..a7168030ef 100644
--- a/Octokit.Reactive/Clients/ObservableUserEmailsClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUserEmailsClient.cs
@@ -19,7 +19,7 @@ public class ObservableUserEmailsClient : IObservableUserEmailsClient
 
         public ObservableUserEmailsClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User.Email;
             _connection = client.Connection;
@@ -47,7 +47,7 @@ public IObservable<EmailAddress> GetAll()
         /// <returns>The <see cref="EmailAddress"/>es for the authenticated user.</returns>
         public IObservable<EmailAddress> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<EmailAddress>(ApiUrls.Emails(), options);
         }
diff --git a/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs b/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
index 0975c65f2a..55daed8657 100644
--- a/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUserGpgKeysClient.cs
@@ -25,7 +25,7 @@ public class ObservableUserGpgKeysClient : IObservableUserGpgKeysClient
 
         public ObservableUserGpgKeysClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User.GpgKey;
         }
@@ -78,7 +78,7 @@ public IObservable<GpgKey> Get(int id)
         /// <returns>The newly created <see cref="GpgKey"/>.</returns>
         public IObservable<GpgKey> Create(NewGpgKey newGpgKey)
         {
-            Ensure.ArgumentNotNull(newGpgKey, "newGpgKey");
+            Ensure.ArgumentNotNull(newGpgKey, nameof(newGpgKey));
 
             return _client.Create(newGpgKey).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableUserKeysClient.cs b/Octokit.Reactive/Clients/ObservableUserKeysClient.cs
index 84b7ccd742..8192984291 100644
--- a/Octokit.Reactive/Clients/ObservableUserKeysClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUserKeysClient.cs
@@ -17,7 +17,7 @@ public class ObservableUserKeysClient : IObservableUserKeysClient
 
         public ObservableUserKeysClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User.GitSshKey;
         }
@@ -32,7 +32,7 @@ public ObservableUserKeysClient(IGitHubClient client)
         /// <returns>Lists the verified public keys for a user.</returns>
         public IObservable<PublicKey> GetAll(string userName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(userName, "userName");
+            Ensure.ArgumentNotNullOrEmptyString(userName, nameof(userName));
 
             return GetAll(userName, ApiOptions.None);
         }
@@ -48,8 +48,8 @@ public IObservable<PublicKey> GetAll(string userName)
         /// <returns>Lists the verified public keys for a user.</returns>
         public IObservable<PublicKey> GetAll(string userName, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(userName, "userName");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(userName, nameof(userName));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _client.GetAll(userName, options).ToObservable().SelectMany(k => k);
         }
@@ -76,7 +76,7 @@ public IObservable<PublicKey> GetAllForCurrent()
         /// <returns>Lists the current user's keys.</returns>
         public IObservable<PublicKey> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _client.GetAllForCurrent(options).ToObservable().SelectMany(k => k);
         }
@@ -104,7 +104,7 @@ public IObservable<PublicKey> Get(int id)
         /// <returns>Creates a public key.</returns>
         public IObservable<PublicKey> Create(NewPublicKey newKey)
         {
-            Ensure.ArgumentNotNull(newKey, "newKey");
+            Ensure.ArgumentNotNull(newKey, nameof(newKey));
 
             return _client.Create(newKey).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableUsersClient.cs b/Octokit.Reactive/Clients/ObservableUsersClient.cs
index 6466a2bfa1..70973195b2 100644
--- a/Octokit.Reactive/Clients/ObservableUsersClient.cs
+++ b/Octokit.Reactive/Clients/ObservableUsersClient.cs
@@ -10,7 +10,7 @@ public class ObservableUsersClient : IObservableUsersClient
 
         public ObservableUsersClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.User;
 
@@ -27,7 +27,7 @@ public ObservableUsersClient(IGitHubClient client)
         /// <param name="login">The login name for the user</param>
         public IObservable<User> Get(string login)
         {
-            Ensure.ArgumentNotNull(login, "login");
+            Ensure.ArgumentNotNull(login, nameof(login));
 
             return _client.Get(login).ToObservable();
         }
@@ -50,7 +50,7 @@ public IObservable<User> Current()
         /// <returns>A <see cref="User"/></returns>
         public IObservable<User> Update(UserUpdate user)
         {
-            Ensure.ArgumentNotNull(user, "user");
+            Ensure.ArgumentNotNull(user, nameof(user));
 
             return _client.Update(user).ToObservable();
         }
diff --git a/Octokit.Reactive/Clients/ObservableWatchedClient.cs b/Octokit.Reactive/Clients/ObservableWatchedClient.cs
index a622c8c6d4..d11d832bc2 100644
--- a/Octokit.Reactive/Clients/ObservableWatchedClient.cs
+++ b/Octokit.Reactive/Clients/ObservableWatchedClient.cs
@@ -17,7 +17,7 @@ public class ObservableWatchedClient : IObservableWatchedClient
 
         public ObservableWatchedClient(IGitHubClient client)
         {
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             _client = client.Activity.Watching;
             _connection = client.Connection;
@@ -31,8 +31,8 @@ public ObservableWatchedClient(IGitHubClient client)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllWatchers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllWatchers(owner, name, ApiOptions.None);
         }
@@ -56,9 +56,9 @@ public IObservable<User> GetAllWatchers(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllWatchers(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Watchers(owner, name), options);
         }
@@ -71,7 +71,7 @@ public IObservable<User> GetAllWatchers(string owner, string name, ApiOptions op
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<User> GetAllWatchers(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<User>(ApiUrls.Watchers(repositoryId), options);
         }
@@ -92,7 +92,7 @@ public IObservable<Repository> GetAllForCurrent()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.Watched(), options);
         }
@@ -104,7 +104,7 @@ public IObservable<Repository> GetAllForCurrent(ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -117,8 +117,8 @@ public IObservable<Repository> GetAllForUser(string user)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<Repository> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.WatchedByUser(user), options);
         }
@@ -131,8 +131,8 @@ public IObservable<Repository> GetAllForUser(string user, ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated</exception>
         public IObservable<bool> CheckWatched(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.CheckWatched(owner, name).ToObservable();
         }
@@ -155,9 +155,9 @@ public IObservable<bool> CheckWatched(long repositoryId)
         /// <param name="newSubscription">A <see cref="NewSubscription"/> instance describing the new subscription to create</param>
         public IObservable<Subscription> WatchRepo(string owner, string name, NewSubscription newSubscription)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newSubscription, "newSubscription");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newSubscription, nameof(newSubscription));
 
             return _client.WatchRepo(owner, name, newSubscription).ToObservable();
         }
@@ -169,7 +169,7 @@ public IObservable<Subscription> WatchRepo(string owner, string name, NewSubscri
         /// <param name="newSubscription">A <see cref="NewSubscription"/> instance describing the new subscription to create</param>
         public IObservable<Subscription> WatchRepo(long repositoryId, NewSubscription newSubscription)
         {
-            Ensure.ArgumentNotNull(newSubscription, "newSubscription");
+            Ensure.ArgumentNotNull(newSubscription, nameof(newSubscription));
 
             return _client.WatchRepo(repositoryId, newSubscription).ToObservable();
         }
@@ -181,8 +181,8 @@ public IObservable<Subscription> WatchRepo(long repositoryId, NewSubscription ne
         /// <param name="name">The name of the repository to unstar</param>
         public IObservable<bool> UnwatchRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return _client.UnwatchRepo(owner, name).ToObservable();
         }
diff --git a/Octokit.Reactive/Helpers/AuthorizationExtensions.cs b/Octokit.Reactive/Helpers/AuthorizationExtensions.cs
index 42959b8884..e9227c95d7 100644
--- a/Octokit.Reactive/Helpers/AuthorizationExtensions.cs
+++ b/Octokit.Reactive/Helpers/AuthorizationExtensions.cs
@@ -35,10 +35,10 @@ public static IObservable<ApplicationAuthorization> GetOrCreateApplicationAuthen
             NewAuthorization newAuthorization,
             Func<TwoFactorRequiredException, IObservable<TwoFactorChallengeResult>> twoFactorChallengeHandler)
         {
-            Ensure.ArgumentNotNull(authorizationsClient, "authorizationsClient");
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNull(authorizationsClient, nameof(authorizationsClient));
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             return authorizationsClient.GetOrCreateApplicationAuthentication(clientId, clientSecret, newAuthorization)
                 .Catch<ApplicationAuthorization, TwoFactorRequiredException>(exception => twoFactorChallengeHandler(exception)
@@ -106,10 +106,10 @@ public static IObservable<ApplicationAuthorization> CreateAndDeleteExistingAppli
             string twoFactorAuthenticationCode,
             bool retryInvalidTwoFactorCode)
         {
-            Ensure.ArgumentNotNull(authorizationsClient, "authorizationsClient");
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNull(authorizationsClient, nameof(authorizationsClient));
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             // If retryInvalidTwoFactorCode is false, then we only show the TwoFactorDialog when we catch 
             // a TwoFactorRequiredException. If it's true, we show it for TwoFactorRequiredException and 
diff --git a/Octokit.Reactive/ObservableGitHubClient.cs b/Octokit.Reactive/ObservableGitHubClient.cs
index 11cba00e31..3a28307919 100644
--- a/Octokit.Reactive/ObservableGitHubClient.cs
+++ b/Octokit.Reactive/ObservableGitHubClient.cs
@@ -28,7 +28,7 @@ public ObservableGitHubClient(ProductHeaderValue productInformation, ICredential
 
         public ObservableGitHubClient(IGitHubClient gitHubClient)
         {
-            Ensure.ArgumentNotNull(gitHubClient, "githubClient");
+            Ensure.ArgumentNotNull(gitHubClient, nameof(gitHubClient));
 
             _gitHubClient = gitHubClient;
             Authorization = new ObservableAuthorizationsClient(gitHubClient);
diff --git a/Octokit/Authentication/Authenticator.cs b/Octokit/Authentication/Authenticator.cs
index a9a0e856d8..adb486afff 100644
--- a/Octokit/Authentication/Authenticator.cs
+++ b/Octokit/Authentication/Authenticator.cs
@@ -15,14 +15,14 @@ class Authenticator
 
         public Authenticator(ICredentialStore credentialStore)
         {
-            Ensure.ArgumentNotNull(credentialStore, "credentialStore");
+            Ensure.ArgumentNotNull(credentialStore, nameof(credentialStore));
 
             CredentialStore = credentialStore;
         }
 
         public async Task Apply(IRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var credentials = await CredentialStore.GetCredentials().ConfigureAwait(false) ?? Credentials.Anonymous;
             authenticators[credentials.AuthenticationType].Authenticate(request, credentials);
diff --git a/Octokit/Authentication/BasicAuthenticator.cs b/Octokit/Authentication/BasicAuthenticator.cs
index 21bb3cce79..98f258a5af 100644
--- a/Octokit/Authentication/BasicAuthenticator.cs
+++ b/Octokit/Authentication/BasicAuthenticator.cs
@@ -17,9 +17,9 @@ class BasicAuthenticator : IAuthenticationHandler
         ///</remarks>
         public void Authenticate(IRequest request, Credentials credentials)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(credentials, "credentials");
-            Ensure.ArgumentNotNull(credentials.Login, "credentials.Login");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(credentials, nameof(credentials));
+            Ensure.ArgumentNotNull(credentials.Login, nameof(credentials.Login));
             Debug.Assert(credentials.Password != null, "It should be impossible for the password to be null");
 
             var header = string.Format(
diff --git a/Octokit/Authentication/TokenAuthenticator.cs b/Octokit/Authentication/TokenAuthenticator.cs
index 2116208ddf..b89e6bcc85 100644
--- a/Octokit/Authentication/TokenAuthenticator.cs
+++ b/Octokit/Authentication/TokenAuthenticator.cs
@@ -15,9 +15,9 @@ class TokenAuthenticator : IAuthenticationHandler
         ///</remarks>
         public void Authenticate(IRequest request, Credentials credentials)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(credentials, "credentials");
-            Ensure.ArgumentNotNull(credentials.Password, "credentials.Password");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(credentials, nameof(credentials));
+            Ensure.ArgumentNotNull(credentials.Password, nameof(credentials.Password));
 
             var token = credentials.GetToken();
             if (credentials.Login != null)
diff --git a/Octokit/Clients/ApiClient.cs b/Octokit/Clients/ApiClient.cs
index a10a2ee467..e3a8e2e36a 100644
--- a/Octokit/Clients/ApiClient.cs
+++ b/Octokit/Clients/ApiClient.cs
@@ -11,7 +11,7 @@ public abstract class ApiClient
         /// <param name="apiConnection">The client's connection</param>
         protected ApiClient(IApiConnection apiConnection)
         {
-            Ensure.ArgumentNotNull(apiConnection, "apiConnection");
+            Ensure.ArgumentNotNull(apiConnection, nameof(apiConnection));
 
             ApiConnection = apiConnection;
             Connection = apiConnection.Connection;
diff --git a/Octokit/Clients/ApiPagination.cs b/Octokit/Clients/ApiPagination.cs
index 882edcd790..5e25310bca 100644
--- a/Octokit/Clients/ApiPagination.cs
+++ b/Octokit/Clients/ApiPagination.cs
@@ -17,7 +17,7 @@ public class ApiPagination : IApiPagination
     {
         public async Task<IReadOnlyList<T>> GetAllPages<T>(Func<Task<IReadOnlyPagedCollection<T>>> getFirstPage, Uri uri)
         {
-            Ensure.ArgumentNotNull(getFirstPage, "getFirstPage");
+            Ensure.ArgumentNotNull(getFirstPage, nameof(getFirstPage));
             try
             {
                 var page = await getFirstPage().ConfigureAwait(false);
diff --git a/Octokit/Clients/AssigneesClient.cs b/Octokit/Clients/AssigneesClient.cs
index 19ce489596..8c8c4e808f 100644
--- a/Octokit/Clients/AssigneesClient.cs
+++ b/Octokit/Clients/AssigneesClient.cs
@@ -26,8 +26,8 @@ public AssigneesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<User>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -49,9 +49,9 @@ public Task<IReadOnlyList<User>> GetAllForRepository(long repositoryId)
         /// <param name="options">The options to change API's response.</param>
         public Task<IReadOnlyList<User>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.Assignees(owner, name);
 
@@ -65,7 +65,7 @@ public Task<IReadOnlyList<User>> GetAllForRepository(string owner, string name,
         /// <param name="options">The options to change API's response.</param>
         public Task<IReadOnlyList<User>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.Assignees(repositoryId);
 
@@ -80,9 +80,9 @@ public Task<IReadOnlyList<User>> GetAllForRepository(long repositoryId, ApiOptio
         /// <param name="assignee">Username of the prospective assignee</param>
         public async Task<bool> CheckAssignee(string owner, string name, string assignee)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(assignee, "assignee");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(assignee, nameof(assignee));
 
             try
             {
@@ -105,9 +105,9 @@ public async Task<bool> CheckAssignee(string owner, string name, string assignee
         /// <returns></returns>
         public Task<Issue> AddAssignees(string owner, string name, int number, AssigneesUpdate assignees)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(assignees, "assignees");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(assignees, nameof(assignees));
 
             return ApiConnection.Post<Issue>(ApiUrls.IssueAssignees(owner, name, number), assignees);
         }
@@ -122,9 +122,9 @@ public Task<Issue> AddAssignees(string owner, string name, int number, Assignees
         /// <returns></returns>
         public Task<Issue> RemoveAssignees(string owner, string name, int number, AssigneesUpdate assignees)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(assignees, "assignees");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(assignees, nameof(assignees));
 
             return ApiConnection.Delete<Issue>(ApiUrls.IssueAssignees(owner, name, number), assignees);
         }
@@ -136,7 +136,7 @@ public Task<Issue> RemoveAssignees(string owner, string name, int number, Assign
         /// <param name="assignee">Username of the prospective assignee</param>
         public async Task<bool> CheckAssignee(long repositoryId, string assignee)
         {
-            Ensure.ArgumentNotNullOrEmptyString(assignee, "assignee");
+            Ensure.ArgumentNotNullOrEmptyString(assignee, nameof(assignee));
 
             try
             {
diff --git a/Octokit/Clients/AuthorizationsClient.cs b/Octokit/Clients/AuthorizationsClient.cs
index 990d0b99e0..e58a8f6767 100644
--- a/Octokit/Clients/AuthorizationsClient.cs
+++ b/Octokit/Clients/AuthorizationsClient.cs
@@ -52,7 +52,7 @@ public Task<IReadOnlyList<Authorization>> GetAll()
         /// <returns>A list of <see cref="Authorization"/>s for the authenticated user.</returns>
         public Task<IReadOnlyList<Authorization>> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Authorization>(ApiUrls.Authorizations(), options);
         }
@@ -94,7 +94,7 @@ public Task<Authorization> Get(int id)
         /// <returns>The created <see cref="Authorization"/>.</returns>
         public Task<ApplicationAuthorization> Create(NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             var requestData = new
             {
@@ -130,8 +130,8 @@ public Task<ApplicationAuthorization> Create(
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             var requestData = new
             {
@@ -169,9 +169,9 @@ public Task<ApplicationAuthorization> Create(
             string clientSecret,
             NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             var requestData = new
             {
@@ -214,10 +214,10 @@ public Task<ApplicationAuthorization> Create(
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             var requestData = new
             {
@@ -257,9 +257,9 @@ public Task<ApplicationAuthorization> GetOrCreateApplicationAuthentication(
             string clientSecret,
             NewAuthorization newAuthorization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
 
             var requestData = new
             {
@@ -300,10 +300,10 @@ public async Task<ApplicationAuthorization> GetOrCreateApplicationAuthentication
             NewAuthorization newAuthorization,
             string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNull(newAuthorization, "newAuthorization");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNull(newAuthorization, nameof(newAuthorization));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             var requestData = new
             {
@@ -338,8 +338,8 @@ public async Task<ApplicationAuthorization> GetOrCreateApplicationAuthentication
         /// <returns>The valid <see cref="ApplicationAuthorization"/>.</returns>
         public Task<ApplicationAuthorization> CheckApplicationAuthentication(string clientId, string accessToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(accessToken, "accessToken");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken));
 
             var endpoint = ApiUrls.ApplicationAuthorization(clientId, accessToken);
             return ApiConnection.Get<ApplicationAuthorization>(endpoint, null);
@@ -357,8 +357,8 @@ public Task<ApplicationAuthorization> CheckApplicationAuthentication(string clie
         /// <returns>The valid <see cref="ApplicationAuthorization"/> with a new OAuth token</returns>
         public Task<ApplicationAuthorization> ResetApplicationAuthentication(string clientId, string accessToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(accessToken, "accessToken");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken));
 
             var requestData = new { };
 
@@ -377,8 +377,8 @@ public Task<ApplicationAuthorization> ResetApplicationAuthentication(string clie
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task RevokeApplicationAuthentication(string clientId, string accessToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(accessToken, "accessToken");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(accessToken, nameof(accessToken));
 
             return ApiConnection.Delete(
                 ApiUrls.ApplicationAuthorization(clientId, accessToken));
@@ -401,7 +401,7 @@ public Task RevokeApplicationAuthentication(string clientId, string accessToken)
         /// <returns>The updated <see cref="Authorization"/>.</returns>
         public Task<Authorization> Update(int id, AuthorizationUpdate authorizationUpdate)
         {
-            Ensure.ArgumentNotNull(authorizationUpdate, "authorizationUpdate");
+            Ensure.ArgumentNotNull(authorizationUpdate, nameof(authorizationUpdate));
 
             return ApiConnection.Patch<Authorization>(
                 ApiUrls.Authorizations(id),
diff --git a/Octokit/Clients/BlobsClient.cs b/Octokit/Clients/BlobsClient.cs
index b8972c4ac0..8cc69ab3e1 100644
--- a/Octokit/Clients/BlobsClient.cs
+++ b/Octokit/Clients/BlobsClient.cs
@@ -30,9 +30,9 @@ public BlobsClient(IApiConnection apiConnection)
         /// <param name="reference">The SHA of the blob</param>
         public Task<Blob> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Blob>(ApiUrls.Blob(owner, name, reference));
         }
@@ -47,7 +47,7 @@ public Task<Blob> Get(string owner, string name, string reference)
         /// <param name="reference">The SHA of the blob</param>
         public Task<Blob> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Blob>(ApiUrls.Blob(repositoryId, reference));
         }
@@ -63,9 +63,9 @@ public Task<Blob> Get(long repositoryId, string reference)
         /// <param name="newBlob">The new Blob</param>
         public Task<BlobReference> Create(string owner, string name, NewBlob newBlob)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newBlob, "newBlob");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newBlob, nameof(newBlob));
 
             return ApiConnection.Post<BlobReference>(ApiUrls.Blobs(owner, name), newBlob);
         }
@@ -80,7 +80,7 @@ public Task<BlobReference> Create(string owner, string name, NewBlob newBlob)
         /// <param name="newBlob">The new Blob</param>
         public Task<BlobReference> Create(long repositoryId, NewBlob newBlob)
         {
-            Ensure.ArgumentNotNull(newBlob, "newBlob");
+            Ensure.ArgumentNotNull(newBlob, nameof(newBlob));
 
             return ApiConnection.Post<BlobReference>(ApiUrls.Blobs(repositoryId), newBlob);
         }
diff --git a/Octokit/Clients/CommitCommentReactionsClient.cs b/Octokit/Clients/CommitCommentReactionsClient.cs
index 064ec27fed..6decd357bc 100644
--- a/Octokit/Clients/CommitCommentReactionsClient.cs
+++ b/Octokit/Clients/CommitCommentReactionsClient.cs
@@ -27,9 +27,9 @@ public CommitCommentReactionsClient(IApiConnection apiConnection)
         /// <returns></returns>
         public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.CommitCommentReactions(owner, name, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -44,7 +44,7 @@ public Task<Reaction> Create(string owner, string name, int number, NewReaction
         /// <returns></returns>
         public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -59,8 +59,8 @@ public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction
         /// <returns></returns>
         public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<Reaction>(ApiUrls.CommitCommentReactions(owner, name, number), AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit/Clients/CommitStatusClient.cs b/Octokit/Clients/CommitStatusClient.cs
index 23c26a4489..c2d9f3c191 100644
--- a/Octokit/Clients/CommitStatusClient.cs
+++ b/Octokit/Clients/CommitStatusClient.cs
@@ -31,9 +31,9 @@ public CommitStatusClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public Task<IReadOnlyList<CommitStatus>> GetAll(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return GetAll(owner, name, reference, ApiOptions.None);
         }
@@ -49,7 +49,7 @@ public Task<IReadOnlyList<CommitStatus>> GetAll(string owner, string name, strin
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public Task<IReadOnlyList<CommitStatus>> GetAll(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return GetAll(repositoryId, reference, ApiOptions.None);
         }
@@ -67,10 +67,10 @@ public Task<IReadOnlyList<CommitStatus>> GetAll(long repositoryId, string refere
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<CommitStatus>> GetAll(string owner, string name, string reference, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitStatus>(ApiUrls.CommitStatuses(owner, name, reference), options);
         }
@@ -87,8 +87,8 @@ public Task<IReadOnlyList<CommitStatus>> GetAll(string owner, string name, strin
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<CommitStatus>> GetAll(long repositoryId, string reference, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitStatus>(ApiUrls.CommitStatuses(repositoryId, reference), options);
         }
@@ -105,9 +105,9 @@ public Task<IReadOnlyList<CommitStatus>> GetAll(long repositoryId, string refere
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public Task<CombinedCommitStatus> GetCombined(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<CombinedCommitStatus>(ApiUrls.CombinedCommitStatus(owner, name, reference));
         }
@@ -123,7 +123,7 @@ public Task<CombinedCommitStatus> GetCombined(string owner, string name, string
         /// <param name="reference">The reference (SHA, branch name, or tag name) to list commits for</param>
         public Task<CombinedCommitStatus> GetCombined(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<CombinedCommitStatus>(ApiUrls.CombinedCommitStatus(repositoryId, reference));
         }
@@ -140,10 +140,10 @@ public Task<CombinedCommitStatus> GetCombined(long repositoryId, string referenc
         /// <param name="newCommitStatus">The commit status to create</param>
         public Task<CommitStatus> Create(string owner, string name, string reference, NewCommitStatus newCommitStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(newCommitStatus, "newCommitStatus");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(newCommitStatus, nameof(newCommitStatus));
 
             return ApiConnection.Post<CommitStatus>(ApiUrls.CreateCommitStatus(owner, name, reference), newCommitStatus);
         }
@@ -159,8 +159,8 @@ public Task<CommitStatus> Create(string owner, string name, string reference, Ne
         /// <param name="newCommitStatus">The commit status to create</param>
         public Task<CommitStatus> Create(long repositoryId, string reference, NewCommitStatus newCommitStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(newCommitStatus, "newCommitStatus");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(newCommitStatus, nameof(newCommitStatus));
 
             return ApiConnection.Post<CommitStatus>(ApiUrls.CreateCommitStatus(repositoryId, reference), newCommitStatus);
         }
diff --git a/Octokit/Clients/CommitsClient.cs b/Octokit/Clients/CommitsClient.cs
index 75321c3b95..0d1661ac65 100644
--- a/Octokit/Clients/CommitsClient.cs
+++ b/Octokit/Clients/CommitsClient.cs
@@ -30,9 +30,9 @@ public CommitsClient(IApiConnection apiConnection) :
         /// <param name="reference">Tha sha reference of the commit</param>
         public Task<Commit> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Commit>(ApiUrls.Commit(owner, name, reference), null, AcceptHeaders.SignatureVerificationPreview);
         }
@@ -47,7 +47,7 @@ public Task<Commit> Get(string owner, string name, string reference)
         /// <param name="reference">Tha sha reference of the commit</param>
         public Task<Commit> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Commit>(ApiUrls.Commit(repositoryId, reference));
         }
@@ -63,9 +63,9 @@ public Task<Commit> Get(long repositoryId, string reference)
         /// <param name="commit">The commit to create</param>
         public Task<Commit> Create(string owner, string name, NewCommit commit)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commit, "commit");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commit, nameof(commit));
 
             return ApiConnection.Post<Commit>(ApiUrls.CreateCommit(owner, name), commit);
         }
@@ -80,7 +80,7 @@ public Task<Commit> Create(string owner, string name, NewCommit commit)
         /// <param name="commit">The commit to create</param>
         public Task<Commit> Create(long repositoryId, NewCommit commit)
         {
-            Ensure.ArgumentNotNull(commit, "commit");
+            Ensure.ArgumentNotNull(commit, nameof(commit));
 
             return ApiConnection.Post<Commit>(ApiUrls.CreateCommit(repositoryId), commit);
         }
diff --git a/Octokit/Clients/DeploymentStatusClient.cs b/Octokit/Clients/DeploymentStatusClient.cs
index 92c50620fa..c1f874eacc 100644
--- a/Octokit/Clients/DeploymentStatusClient.cs
+++ b/Octokit/Clients/DeploymentStatusClient.cs
@@ -29,8 +29,8 @@ public DeploymentStatusClient(IApiConnection apiConnection)
         /// <param name="deploymentId">The id of the deployment.</param>
         public Task<IReadOnlyList<DeploymentStatus>> GetAll(string owner, string name, int deploymentId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, deploymentId, ApiOptions.None);
         }
@@ -62,9 +62,9 @@ public Task<IReadOnlyList<DeploymentStatus>> GetAll(long repositoryId, int deplo
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<DeploymentStatus>> GetAll(string owner, string name, int deploymentId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<DeploymentStatus>(ApiUrls.DeploymentStatuses(owner, name, deploymentId),
                                                           null,
@@ -84,7 +84,7 @@ public Task<IReadOnlyList<DeploymentStatus>> GetAll(string owner, string name, i
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<DeploymentStatus>> GetAll(long repositoryId, int deploymentId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<DeploymentStatus>(ApiUrls.DeploymentStatuses(repositoryId, deploymentId), options);
         }
@@ -102,9 +102,9 @@ public Task<IReadOnlyList<DeploymentStatus>> GetAll(long repositoryId, int deplo
         /// <param name="newDeploymentStatus">The new deployment status to create.</param>
         public Task<DeploymentStatus> Create(string owner, string name, int deploymentId, NewDeploymentStatus newDeploymentStatus)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newDeploymentStatus, "newDeploymentStatus");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newDeploymentStatus, nameof(newDeploymentStatus));
 
             return ApiConnection.Post<DeploymentStatus>(ApiUrls.DeploymentStatuses(owner, name, deploymentId),
                                                         newDeploymentStatus,
@@ -123,7 +123,7 @@ public Task<DeploymentStatus> Create(string owner, string name, int deploymentId
         /// <param name="newDeploymentStatus">The new deployment status to create.</param>
         public Task<DeploymentStatus> Create(long repositoryId, int deploymentId, NewDeploymentStatus newDeploymentStatus)
         {
-            Ensure.ArgumentNotNull(newDeploymentStatus, "newDeploymentStatus");
+            Ensure.ArgumentNotNull(newDeploymentStatus, nameof(newDeploymentStatus));
 
             return ApiConnection.Post<DeploymentStatus>(ApiUrls.DeploymentStatuses(repositoryId, deploymentId),
                                                         newDeploymentStatus);
diff --git a/Octokit/Clients/DeploymentsClient.cs b/Octokit/Clients/DeploymentsClient.cs
index 486fa19875..d93380a340 100644
--- a/Octokit/Clients/DeploymentsClient.cs
+++ b/Octokit/Clients/DeploymentsClient.cs
@@ -33,8 +33,8 @@ public DeploymentsClient(IApiConnection apiConnection)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Deployment>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -64,9 +64,9 @@ public Task<IReadOnlyList<Deployment>> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Deployment>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Deployment>(ApiUrls.Deployments(owner, name),
                                                     null,
@@ -85,7 +85,7 @@ public Task<IReadOnlyList<Deployment>> GetAll(string owner, string name, ApiOpti
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Deployment>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Deployment>(ApiUrls.Deployments(repositoryId), options);
         }
@@ -102,9 +102,9 @@ public Task<IReadOnlyList<Deployment>> GetAll(long repositoryId, ApiOptions opti
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
         public Task<Deployment> Create(string owner, string name, NewDeployment newDeployment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newDeployment, "newDeployment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newDeployment, nameof(newDeployment));
 
             return ApiConnection.Post<Deployment>(ApiUrls.Deployments(owner, name),
                                                   newDeployment,
@@ -122,7 +122,7 @@ public Task<Deployment> Create(string owner, string name, NewDeployment newDeplo
         /// <param name="newDeployment">A <see cref="NewDeployment"/> instance describing the new deployment to create</param>
         public Task<Deployment> Create(long repositoryId, NewDeployment newDeployment)
         {
-            Ensure.ArgumentNotNull(newDeployment, "newDeployment");
+            Ensure.ArgumentNotNull(newDeployment, nameof(newDeployment));
 
             return ApiConnection.Post<Deployment>(ApiUrls.Deployments(repositoryId),
                                                      newDeployment);
diff --git a/Octokit/Clients/Enterprise/EnterpriseLdapClient.cs b/Octokit/Clients/Enterprise/EnterpriseLdapClient.cs
index 16c8987fa1..f9fde1d31c 100644
--- a/Octokit/Clients/Enterprise/EnterpriseLdapClient.cs
+++ b/Octokit/Clients/Enterprise/EnterpriseLdapClient.cs
@@ -26,8 +26,8 @@ public EnterpriseLdapClient(IApiConnection apiConnection)
         /// <returns>The <see cref="User"/> object.</returns>
         public Task<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMapping)
         {
-            Ensure.ArgumentNotNull(userName, "userName");
-            Ensure.ArgumentNotNull(newLdapMapping, "newLdapMapping");
+            Ensure.ArgumentNotNull(userName, nameof(userName));
+            Ensure.ArgumentNotNull(newLdapMapping, nameof(newLdapMapping));
 
             var endpoint = ApiUrls.EnterpriseLdapUserMapping(userName);
 
@@ -44,7 +44,7 @@ public Task<User> UpdateUserMapping(string userName, NewLdapMapping newLdapMappi
         /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public async Task<LdapSyncResponse> QueueSyncUserMapping(string userName)
         {
-            Ensure.ArgumentNotNull(userName, "userName");
+            Ensure.ArgumentNotNull(userName, nameof(userName));
 
             var endpoint = ApiUrls.EnterpriseLdapUserSync(userName);
 
@@ -68,8 +68,8 @@ public async Task<LdapSyncResponse> QueueSyncUserMapping(string userName)
         /// <returns>The <see cref="Team"/> object.</returns>
         public Task<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
         {
-            Ensure.ArgumentNotNull(teamId, "teamId");
-            Ensure.ArgumentNotNull(newLdapMapping, "newLdapMapping");
+            Ensure.ArgumentNotNull(teamId, nameof(teamId));
+            Ensure.ArgumentNotNull(newLdapMapping, nameof(newLdapMapping));
 
             var endpoint = ApiUrls.EnterpriseLdapTeamMapping(teamId);
 
@@ -86,7 +86,7 @@ public Task<Team> UpdateTeamMapping(int teamId, NewLdapMapping newLdapMapping)
         /// <returns>The <see cref="LdapSyncResponse"/> of the queue request.</returns>
         public async Task<LdapSyncResponse> QueueSyncTeamMapping(int teamId)
         {
-            Ensure.ArgumentNotNull(teamId, "teamId");
+            Ensure.ArgumentNotNull(teamId, nameof(teamId));
 
             var endpoint = ApiUrls.EnterpriseLdapTeamSync(teamId);
 
diff --git a/Octokit/Clients/Enterprise/EnterpriseOrganizationClient.cs b/Octokit/Clients/Enterprise/EnterpriseOrganizationClient.cs
index 22fee1481e..1392509065 100644
--- a/Octokit/Clients/Enterprise/EnterpriseOrganizationClient.cs
+++ b/Octokit/Clients/Enterprise/EnterpriseOrganizationClient.cs
@@ -24,7 +24,7 @@ public EnterpriseOrganizationClient(IApiConnection apiConnection)
         /// <returns>The <see cref="Organization"/> created.</returns>
         public Task<Organization> Create(NewOrganization newOrganization)
         {
-            Ensure.ArgumentNotNull(newOrganization, "newOrganization");
+            Ensure.ArgumentNotNull(newOrganization, nameof(newOrganization));
 
             var endpoint = ApiUrls.EnterpriseOrganization();
 
diff --git a/Octokit/Clients/Enterprise/EnterpriseProbe.cs b/Octokit/Clients/Enterprise/EnterpriseProbe.cs
index be0f598df9..3584825ea6 100644
--- a/Octokit/Clients/Enterprise/EnterpriseProbe.cs
+++ b/Octokit/Clients/Enterprise/EnterpriseProbe.cs
@@ -47,8 +47,8 @@ public EnterpriseProbe(ProductHeaderValue productInformation)
         /// </param>
         public EnterpriseProbe(ProductHeaderValue productInformation, IHttpClient httpClient)
         {
-            Ensure.ArgumentNotNull(productInformation, "productHeader");
-            Ensure.ArgumentNotNull(httpClient, "httpClient");
+            Ensure.ArgumentNotNull(productInformation, nameof(productInformation));
+            Ensure.ArgumentNotNull(httpClient, nameof(httpClient));
 
             productHeader = productInformation;
             this.httpClient = httpClient;
diff --git a/Octokit/Clients/Enterprise/EnterpriseSearchIndexingClient.cs b/Octokit/Clients/Enterprise/EnterpriseSearchIndexingClient.cs
index 0feea1866c..d041e57e77 100644
--- a/Octokit/Clients/Enterprise/EnterpriseSearchIndexingClient.cs
+++ b/Octokit/Clients/Enterprise/EnterpriseSearchIndexingClient.cs
@@ -25,7 +25,7 @@ public EnterpriseSearchIndexingClient(IApiConnection apiConnection)
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> Queue(string owner)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}", owner));
@@ -44,8 +44,8 @@ public Task<SearchIndexingResponse> Queue(string owner)
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> Queue(string owner, string repository)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
-            Ensure.ArgumentNotNull(repository, "repository");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
+            Ensure.ArgumentNotNull(repository, nameof(repository));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, repository));
@@ -63,7 +63,7 @@ public Task<SearchIndexingResponse> Queue(string owner, string repository)
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> QueueAll(string owner)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/*", owner));
@@ -82,8 +82,8 @@ public Task<SearchIndexingResponse> QueueAll(string owner)
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> QueueAllIssues(string owner, string repository)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
-            Ensure.ArgumentNotNull(repository, "repository");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
+            Ensure.ArgumentNotNull(repository, nameof(repository));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/{1}/issues", owner, repository));
@@ -101,7 +101,7 @@ public Task<SearchIndexingResponse> QueueAllIssues(string owner, string reposito
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> QueueAllIssues(string owner)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/*/issues", owner));
@@ -120,8 +120,8 @@ public Task<SearchIndexingResponse> QueueAllIssues(string owner)
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> QueueAllCode(string owner, string repository)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
-            Ensure.ArgumentNotNull(repository, "repository");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
+            Ensure.ArgumentNotNull(repository, nameof(repository));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/{1}/code", owner, repository));
@@ -139,7 +139,7 @@ public Task<SearchIndexingResponse> QueueAllCode(string owner, string repository
         /// <returns>The <see cref="SearchIndexingResponse"/> message.</returns>
         public Task<SearchIndexingResponse> QueueAllCode(string owner)
         {
-            Ensure.ArgumentNotNull(owner, "owner");
+            Ensure.ArgumentNotNull(owner, nameof(owner));
 
             var endpoint = ApiUrls.EnterpriseSearchIndexing();
             var target = new SearchIndexTarget(string.Format(CultureInfo.InvariantCulture, "{0}/*/code", owner));
diff --git a/Octokit/Clients/EventsClient.cs b/Octokit/Clients/EventsClient.cs
index d9b0c5c7f6..d7be186e9c 100644
--- a/Octokit/Clients/EventsClient.cs
+++ b/Octokit/Clients/EventsClient.cs
@@ -41,7 +41,7 @@ public Task<IReadOnlyList<Activity>> GetAll()
         /// <returns>All the public <see cref="Activity"/>s for the particular user.</returns>        
         public Task<IReadOnlyList<Activity>> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.Events(), options);
         }
@@ -56,8 +56,8 @@ public Task<IReadOnlyList<Activity>> GetAll(ApiOptions options)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Activity>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -85,9 +85,9 @@ public Task<IReadOnlyList<Activity>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.Events(owner, name), options);
         }
@@ -102,7 +102,7 @@ public Task<IReadOnlyList<Activity>> GetAllForRepository(string owner, string na
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.Events(repositoryId), options);
         }
@@ -117,8 +117,8 @@ public Task<IReadOnlyList<Activity>> GetAllForRepository(long repositoryId, ApiO
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllIssuesForRepository(owner, name, ApiOptions.None);
         }
@@ -146,9 +146,9 @@ public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(long repository
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(owner, name), options);
         }
@@ -163,7 +163,7 @@ public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(string owner, s
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(repositoryId), options);
         }
@@ -178,8 +178,8 @@ public Task<IReadOnlyList<IssueEvent>> GetAllIssuesForRepository(long repository
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Activity>> GetAllForRepositoryNetwork(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepositoryNetwork(owner, name, ApiOptions.None);
         }
@@ -195,9 +195,9 @@ public Task<IReadOnlyList<Activity>> GetAllForRepositoryNetwork(string owner, st
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllForRepositoryNetwork(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.NetworkEvents(owner, name), options);
         }
@@ -211,7 +211,7 @@ public Task<IReadOnlyList<Activity>> GetAllForRepositoryNetwork(string owner, st
         /// <param name="organization">The name of the organization</param>
         public Task<IReadOnlyList<Activity>> GetAllForOrganization(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrganization(organization, ApiOptions.None);
         }
@@ -226,8 +226,8 @@ public Task<IReadOnlyList<Activity>> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.OrganizationEvents(organization), options);
         }
@@ -241,7 +241,7 @@ public Task<IReadOnlyList<Activity>> GetAllForOrganization(string organization,
         /// <param name="user">The login of the user</param>
         public Task<IReadOnlyList<Activity>> GetAllUserReceived(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserReceived(user, ApiOptions.None);
         }
@@ -256,8 +256,8 @@ public Task<IReadOnlyList<Activity>> GetAllUserReceived(string user)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllUserReceived(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.ReceivedEvents(user), options);
         }
@@ -271,7 +271,7 @@ public Task<IReadOnlyList<Activity>> GetAllUserReceived(string user, ApiOptions
         /// <param name="user">The login of the user</param>
         public Task<IReadOnlyList<Activity>> GetAllUserReceivedPublic(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserReceivedPublic(user, ApiOptions.None);
         }
@@ -286,8 +286,8 @@ public Task<IReadOnlyList<Activity>> GetAllUserReceivedPublic(string user)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllUserReceivedPublic(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.ReceivedEvents(user, true), options);
         }
@@ -301,7 +301,7 @@ public Task<IReadOnlyList<Activity>> GetAllUserReceivedPublic(string user, ApiOp
         /// <param name="user">The login of the user</param>
         public Task<IReadOnlyList<Activity>> GetAllUserPerformed(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserPerformed(user, ApiOptions.None);
         }
@@ -316,8 +316,8 @@ public Task<IReadOnlyList<Activity>> GetAllUserPerformed(string user)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllUserPerformed(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.PerformedEvents(user), options);
         }
@@ -331,7 +331,7 @@ public Task<IReadOnlyList<Activity>> GetAllUserPerformed(string user, ApiOptions
         /// <param name="user">The login of the user</param>
         public Task<IReadOnlyList<Activity>> GetAllUserPerformedPublic(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllUserPerformedPublic(user, ApiOptions.None);
         }
@@ -346,8 +346,8 @@ public Task<IReadOnlyList<Activity>> GetAllUserPerformedPublic(string user)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllUserPerformedPublic(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.PerformedEvents(user, true), options);
         }
@@ -362,8 +362,8 @@ public Task<IReadOnlyList<Activity>> GetAllUserPerformedPublic(string user, ApiO
         /// <param name="organization">The name of the organization</param>
         public Task<IReadOnlyList<Activity>> GetAllForAnOrganization(string user, string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForAnOrganization(user, organization, ApiOptions.None);
         }
@@ -379,9 +379,9 @@ public Task<IReadOnlyList<Activity>> GetAllForAnOrganization(string user, string
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Activity>> GetAllForAnOrganization(string user, string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Activity>(ApiUrls.OrganizationEvents(user, organization), options);
         }
diff --git a/Octokit/Clients/FollowersClient.cs b/Octokit/Clients/FollowersClient.cs
index 8a80868144..f4bb34cc6e 100644
--- a/Octokit/Clients/FollowersClient.cs
+++ b/Octokit/Clients/FollowersClient.cs
@@ -42,7 +42,7 @@ public Task<IReadOnlyList<User>> GetAllForCurrent()
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that follow the authenticated user.</returns>
         public Task<IReadOnlyList<User>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Followers(), options);
         }
@@ -57,7 +57,7 @@ public Task<IReadOnlyList<User>> GetAllForCurrent(ApiOptions options)
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that follow the passed user.</returns>
         public Task<IReadOnlyList<User>> GetAll(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAll(login, ApiOptions.None);
         }
@@ -73,8 +73,8 @@ public Task<IReadOnlyList<User>> GetAll(string login)
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that follow the passed user.</returns>
         public Task<IReadOnlyList<User>> GetAll(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Followers(login), options);
         }
@@ -101,7 +101,7 @@ public Task<IReadOnlyList<User>> GetAllFollowingForCurrent()
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that the authenticated user follows.</returns>
         public Task<IReadOnlyList<User>> GetAllFollowingForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Following(), options);
         }
@@ -116,7 +116,7 @@ public Task<IReadOnlyList<User>> GetAllFollowingForCurrent(ApiOptions options)
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that the passed user follows.</returns>
         public Task<IReadOnlyList<User>> GetAllFollowing(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAllFollowing(login, ApiOptions.None);
         }
@@ -132,8 +132,8 @@ public Task<IReadOnlyList<User>> GetAllFollowing(string login)
         /// <returns>A <see cref="IReadOnlyList{User}"/> of <see cref="User"/>s that the passed user follows.</returns>
         public Task<IReadOnlyList<User>> GetAllFollowing(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Following(login), options);
         }
@@ -148,7 +148,7 @@ public Task<IReadOnlyList<User>> GetAllFollowing(string login, ApiOptions option
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public async Task<bool> IsFollowingForCurrent(string following)
         {
-            Ensure.ArgumentNotNullOrEmptyString(following, "following");
+            Ensure.ArgumentNotNullOrEmptyString(following, nameof(following));
 
             try
             {
@@ -172,8 +172,8 @@ public async Task<bool> IsFollowingForCurrent(string following)
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public async Task<bool> IsFollowing(string login, string following)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNullOrEmptyString(following, "following");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNullOrEmptyString(following, nameof(following));
 
             try
             {
@@ -196,7 +196,7 @@ public async Task<bool> IsFollowing(string login, string following)
         /// <returns>A <c>bool</c> representing the success of the operation.</returns>
         public async Task<bool> Follow(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             try
             {
@@ -224,7 +224,7 @@ public async Task<bool> Follow(string login)
         /// <returns></returns>
         public Task Unfollow(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return ApiConnection.Delete(ApiUrls.IsFollowing(login));
         }
diff --git a/Octokit/Clients/GistCommentsClient.cs b/Octokit/Clients/GistCommentsClient.cs
index c9954b9c4d..1bcbae37bc 100644
--- a/Octokit/Clients/GistCommentsClient.cs
+++ b/Octokit/Clients/GistCommentsClient.cs
@@ -39,7 +39,7 @@ public Task<GistComment> Get(string gistId, int commentId)
         /// <returns>Task{IReadOnlyList{GistComment}}.</returns>
         public Task<IReadOnlyList<GistComment>> GetAllForGist(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(gistId, "gistId");
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
             return GetAllForGist(gistId, ApiOptions.None);
         }
@@ -53,8 +53,8 @@ public Task<IReadOnlyList<GistComment>> GetAllForGist(string gistId)
         /// <returns>Task{IReadOnlyList{GistComment}}.</returns>
         public Task<IReadOnlyList<GistComment>> GetAllForGist(string gistId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(gistId, "gistId");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GistComment>(ApiUrls.GistComments(gistId), options);
         }
@@ -68,7 +68,7 @@ public Task<IReadOnlyList<GistComment>> GetAllForGist(string gistId, ApiOptions
         /// <returns>Task{GistComment}.</returns>
         public Task<GistComment> Create(string gistId, string comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
             return ApiConnection.Post<GistComment>(ApiUrls.GistComments(gistId), new BodyWrapper(comment));
         }
@@ -83,7 +83,7 @@ public Task<GistComment> Create(string gistId, string comment)
         /// <returns>Task{GistComment}.</returns>
         public Task<GistComment> Update(string gistId, int commentId, string comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
             return ApiConnection.Patch<GistComment>(ApiUrls.GistComment(gistId, commentId), new BodyWrapper(comment));
         }
diff --git a/Octokit/Clients/GistsClient.cs b/Octokit/Clients/GistsClient.cs
index aedc99cd7a..331a0600d6 100644
--- a/Octokit/Clients/GistsClient.cs
+++ b/Octokit/Clients/GistsClient.cs
@@ -45,7 +45,7 @@ public Task<Gist> Get(string id)
         /// <param name="newGist">The new gist to create</param>
         public Task<Gist> Create(NewGist newGist)
         {
-            Ensure.ArgumentNotNull(newGist, "newGist");
+            Ensure.ArgumentNotNull(newGist, nameof(newGist));
 
             //Required to create anonymous object to match signature of files hash.  
             // Allowing the serializer to handle Dictionary<string,NewGistFile> 
@@ -87,7 +87,7 @@ public Task<Gist> Fork(string id)
         /// <param name="id">The id of the gist</param>
         public Task Delete(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return ApiConnection.Delete(ApiUrls.Gist(id));
         }
@@ -114,7 +114,7 @@ public Task<IReadOnlyList<Gist>> GetAll()
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Gist>(ApiUrls.Gist(), options);
         }
@@ -143,7 +143,7 @@ public Task<IReadOnlyList<Gist>> GetAll(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAll(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return ApiConnection.GetAll<Gist>(ApiUrls.Gist(), request.ToParametersDictionary(), options);
@@ -169,7 +169,7 @@ public Task<IReadOnlyList<Gist>> GetAllPublic()
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllPublic(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Gist>(ApiUrls.PublicGists(), options);
         }
@@ -196,7 +196,7 @@ public Task<IReadOnlyList<Gist>> GetAllPublic(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllPublic(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return ApiConnection.GetAll<Gist>(ApiUrls.PublicGists(), request.ToParametersDictionary(), options);
@@ -222,7 +222,7 @@ public Task<IReadOnlyList<Gist>> GetAllStarred()
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllStarred(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Gist>(ApiUrls.StarredGists(), options);
         }
@@ -249,7 +249,7 @@ public Task<IReadOnlyList<Gist>> GetAllStarred(DateTimeOffset since)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllStarred(DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return ApiConnection.GetAll<Gist>(ApiUrls.StarredGists(), request.ToParametersDictionary(), options);
@@ -264,7 +264,7 @@ public Task<IReadOnlyList<Gist>> GetAllStarred(DateTimeOffset since, ApiOptions
         /// <param name="user">The user</param>
         public Task<IReadOnlyList<Gist>> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -279,8 +279,8 @@ public Task<IReadOnlyList<Gist>> GetAllForUser(string user)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Gist>(ApiUrls.UsersGists(user), options);
         }
@@ -295,7 +295,7 @@ public Task<IReadOnlyList<Gist>> GetAllForUser(string user, ApiOptions options)
         /// <param name="since">Only gists updated at or after this time are returned</param>
         public Task<IReadOnlyList<Gist>> GetAllForUser(string user, DateTimeOffset since)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, since, ApiOptions.None);
         }
@@ -311,8 +311,8 @@ public Task<IReadOnlyList<Gist>> GetAllForUser(string user, DateTimeOffset since
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Gist>> GetAllForUser(string user, DateTimeOffset since, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var request = new GistRequest(since);
             return ApiConnection.GetAll<Gist>(ApiUrls.UsersGists(user), request.ToParametersDictionary(), options);
@@ -327,7 +327,7 @@ public Task<IReadOnlyList<Gist>> GetAllForUser(string user, DateTimeOffset since
         /// <param name="id">The id of the gist</param>
         public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return GetAllCommits(id, ApiOptions.None);
         }
@@ -342,8 +342,8 @@ public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GistHistory>(ApiUrls.GistCommits(id), options);
         }
@@ -357,7 +357,7 @@ public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id, ApiOptions opti
         /// <param name="id">The id of the gist</param>
         public Task<IReadOnlyList<GistFork>> GetAllForks(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return GetAllForks(id, ApiOptions.None);
         }
@@ -372,8 +372,8 @@ public Task<IReadOnlyList<GistFork>> GetAllForks(string id)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<GistFork>> GetAllForks(string id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GistFork>(ApiUrls.ForkGist(id), options);
         }
@@ -388,8 +388,8 @@ public Task<IReadOnlyList<GistFork>> GetAllForks(string id, ApiOptions options)
         /// <param name="gistUpdate">The update to the gist</param>
         public Task<Gist> Edit(string id, GistUpdate gistUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
-            Ensure.ArgumentNotNull(gistUpdate, "gistUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNull(gistUpdate, nameof(gistUpdate));
 
             var filesAsJsonObject = new JsonObject();
             foreach (var kvp in gistUpdate.Files)
@@ -415,7 +415,7 @@ public Task<Gist> Edit(string id, GistUpdate gistUpdate)
         /// <param name="id">The id of the gist</param>
         public Task Star(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return ApiConnection.Put(ApiUrls.StarGist(id));
         }
@@ -429,7 +429,7 @@ public Task Star(string id)
         /// <param name="id">The id of the gist</param>
         public Task Unstar(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             return ApiConnection.Delete(ApiUrls.StarGist(id));
         }
@@ -443,7 +443,7 @@ public Task Unstar(string id)
         /// <param name="id">The id of the gist</param>
         public async Task<bool> IsStarred(string id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, "id");
+            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
 
             try
             {
diff --git a/Octokit/Clients/IssueCommentReactionsClient.cs b/Octokit/Clients/IssueCommentReactionsClient.cs
index 8fdbe123a1..6f3f7ebac4 100644
--- a/Octokit/Clients/IssueCommentReactionsClient.cs
+++ b/Octokit/Clients/IssueCommentReactionsClient.cs
@@ -26,9 +26,9 @@ public IssueCommentReactionsClient(IApiConnection apiConnection)
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.IssueCommentReactions(owner, name, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -42,7 +42,7 @@ public Task<Reaction> Create(string owner, string name, int number, NewReaction
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -56,8 +56,8 @@ public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction
         /// <param name="number">The comment id</param>        
         public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<Reaction>(ApiUrls.IssueCommentReactions(owner, name, number), AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit/Clients/IssueCommentsClient.cs b/Octokit/Clients/IssueCommentsClient.cs
index 776de3154c..1c527d4b23 100644
--- a/Octokit/Clients/IssueCommentsClient.cs
+++ b/Octokit/Clients/IssueCommentsClient.cs
@@ -28,8 +28,8 @@ public IssueCommentsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="id">The issue comment id</param>
         public Task<IssueComment> Get(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(owner, name, id), null, AcceptHeaders.ReactionsPreview);
         }
@@ -53,8 +53,8 @@ public Task<IssueComment> Get(long repositoryId, int id)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, new IssueCommentRequest(), ApiOptions.None);
         }
@@ -78,9 +78,9 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new IssueCommentRequest(), options);
         }
@@ -93,7 +93,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, strin
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new IssueCommentRequest(), options);
         }
@@ -107,9 +107,9 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId,
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, string name, IssueCommentRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -122,7 +122,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, strin
         /// <param name="request">The sorting <see cref="IssueCommentRequest">parameters</see></param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId, IssueCommentRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -137,10 +137,10 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, string name, IssueCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -154,8 +154,8 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(string owner, strin
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId, IssueCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -169,8 +169,8 @@ public Task<IReadOnlyList<IssueComment>> GetAllForRepository(long repositoryId,
         /// <param name="number">The issue number</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -196,9 +196,9 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int n
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(owner, name, number), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -212,7 +212,7 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(string owner, string nam
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueComment>(ApiUrls.IssueComments(repositoryId, number), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -227,9 +227,9 @@ public Task<IReadOnlyList<IssueComment>> GetAllForIssue(long repositoryId, int n
         /// <param name="newComment">The new comment to add to the issue</param>
         public Task<IssueComment> Create(string owner, string name, int number, string newComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newComment, "newComment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
             return ApiConnection.Post<IssueComment>(ApiUrls.IssueComments(owner, name, number), new BodyWrapper(newComment));
         }
@@ -243,7 +243,7 @@ public Task<IssueComment> Create(string owner, string name, int number, string n
         /// <param name="newComment">The new comment to add to the issue</param>
         public Task<IssueComment> Create(long repositoryId, int number, string newComment)
         {
-            Ensure.ArgumentNotNull(newComment, "newComment");
+            Ensure.ArgumentNotNull(newComment, nameof(newComment));
 
             return ApiConnection.Post<IssueComment>(ApiUrls.IssueComments(repositoryId, number), new BodyWrapper(newComment));
         }
@@ -258,9 +258,9 @@ public Task<IssueComment> Create(long repositoryId, int number, string newCommen
         /// <param name="commentUpdate">The modified comment</param>
         public Task<IssueComment> Update(string owner, string name, int id, string commentUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return ApiConnection.Patch<IssueComment>(ApiUrls.IssueComment(owner, name, id), new BodyWrapper(commentUpdate));
         }
@@ -274,7 +274,7 @@ public Task<IssueComment> Update(string owner, string name, int id, string comme
         /// <param name="commentUpdate">The modified comment</param>
         public Task<IssueComment> Update(long repositoryId, int id, string commentUpdate)
         {
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return ApiConnection.Patch<IssueComment>(ApiUrls.IssueComment(repositoryId, id), new BodyWrapper(commentUpdate));
         }
@@ -288,8 +288,8 @@ public Task<IssueComment> Update(long repositoryId, int id, string commentUpdate
         /// <param name="id">The comment id</param>
         public Task Delete(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.IssueComment(owner, name, id));
         }
diff --git a/Octokit/Clients/IssueReactionsClient.cs b/Octokit/Clients/IssueReactionsClient.cs
index b4a2ec0899..6b0dd40667 100644
--- a/Octokit/Clients/IssueReactionsClient.cs
+++ b/Octokit/Clients/IssueReactionsClient.cs
@@ -25,8 +25,8 @@ public IssueReactionsClient(IApiConnection apiConnection)
         /// <param name="number">The issue id</param>        
         public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<Reaction>(ApiUrls.IssueReactions(owner, name, number), AcceptHeaders.ReactionsPreview);
         }
@@ -52,9 +52,9 @@ public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number)
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.IssueReactions(owner, name, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -68,7 +68,7 @@ public Task<Reaction> Create(string owner, string name, int number, NewReaction
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.IssueReactions(repositoryId, number), reaction, AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit/Clients/IssueTimelineClient.cs b/Octokit/Clients/IssueTimelineClient.cs
index 4ea750e7a3..454125aed9 100644
--- a/Octokit/Clients/IssueTimelineClient.cs
+++ b/Octokit/Clients/IssueTimelineClient.cs
@@ -26,8 +26,8 @@ public IssueTimelineClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="number">The issue number</param>
         public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
 
             return GetAllForIssue(owner, repo, number, ApiOptions.None);
         }
@@ -44,9 +44,9 @@ public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, strin
         /// <param name="options">Options for changing the API repsonse</param>
         public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(string owner, string repo, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<TimelineEventInfo>(ApiUrls.IssueTimeline(owner, repo, number), null, AcceptHeaders.IssueTimelineApiPreview, options);
         }
@@ -75,7 +75,7 @@ public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<TimelineEventInfo>> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<TimelineEventInfo>(ApiUrls.IssueTimeline(repositoryId, number), null, AcceptHeaders.IssueTimelineApiPreview, options);
         }
diff --git a/Octokit/Clients/IssuesClient.cs b/Octokit/Clients/IssuesClient.cs
index 89a933422a..3574a9f1e5 100644
--- a/Octokit/Clients/IssuesClient.cs
+++ b/Octokit/Clients/IssuesClient.cs
@@ -68,8 +68,8 @@ public IssuesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="number">The issue number</param>
         public Task<Issue> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<Issue>(ApiUrls.Issue(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
@@ -111,7 +111,7 @@ public Task<IReadOnlyList<Issue>> GetAllForCurrent()
         /// </remarks>
         public Task<IReadOnlyList<Issue>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForCurrent(new IssueRequest(), options);
         }
@@ -126,7 +126,7 @@ public Task<IReadOnlyList<Issue>> GetAllForCurrent(ApiOptions options)
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public Task<IReadOnlyList<Issue>> GetAllForCurrent(IssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -142,8 +142,8 @@ public Task<IReadOnlyList<Issue>> GetAllForCurrent(IssueRequest request)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForCurrent(IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Issue>(ApiUrls.Issues(), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -172,7 +172,7 @@ public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories()
         /// </remarks>
         public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForOwnedAndMemberRepositories(new IssueRequest(), options);
         }
@@ -186,7 +186,7 @@ public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(ApiOptions
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(IssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForOwnedAndMemberRepositories(request, ApiOptions.None);
         }
@@ -201,8 +201,8 @@ public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(IssueReque
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Issue>(ApiUrls.IssuesForOwnedAndMember(), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -216,7 +216,7 @@ public Task<IReadOnlyList<Issue>> GetAllForOwnedAndMemberRepositories(IssueReque
         /// <param name="organization">The name of the organization</param>
         public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrganization(organization, ApiOptions.None);
         }
@@ -231,8 +231,8 @@ public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForOrganization(organization, new IssueRequest(), options);
         }
@@ -247,8 +247,8 @@ public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, Api
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, IssueRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForOrganization(organization, request, ApiOptions.None);
         }
@@ -264,9 +264,9 @@ public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, Iss
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, IssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Issue>(ApiUrls.Issues(organization), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -281,8 +281,8 @@ public Task<IReadOnlyList<Issue>> GetAllForOrganization(string organization, Iss
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, new RepositoryIssueRequest());
         }
@@ -310,9 +310,9 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new RepositoryIssueRequest(), options);
         }
@@ -327,7 +327,7 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new RepositoryIssueRequest(), options);
         }
@@ -343,9 +343,9 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, ApiOpti
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name, RepositoryIssueRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -360,7 +360,7 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name,
         /// <param name="request">Used to filter and sort the list of issues returned</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, RepositoryIssueRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -377,10 +377,10 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, Reposit
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name, RepositoryIssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Issue>(ApiUrls.Issues(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -396,8 +396,8 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, RepositoryIssueRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Issue>(ApiUrls.Issues(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -412,9 +412,9 @@ public Task<IReadOnlyList<Issue>> GetAllForRepository(long repositoryId, Reposit
         /// <param name="newIssue">A <see cref="NewIssue"/> instance describing the new issue to create</param>
         public Task<Issue> Create(string owner, string name, NewIssue newIssue)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newIssue, "newIssue");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newIssue, nameof(newIssue));
 
             return ApiConnection.Post<Issue>(ApiUrls.Issues(owner, name), newIssue);
         }
@@ -428,7 +428,7 @@ public Task<Issue> Create(string owner, string name, NewIssue newIssue)
         /// <param name="newIssue">A <see cref="NewIssue"/> instance describing the new issue to create</param>
         public Task<Issue> Create(long repositoryId, NewIssue newIssue)
         {
-            Ensure.ArgumentNotNull(newIssue, "newIssue");
+            Ensure.ArgumentNotNull(newIssue, nameof(newIssue));
 
             return ApiConnection.Post<Issue>(ApiUrls.Issues(repositoryId), newIssue);
         }
@@ -444,9 +444,9 @@ public Task<Issue> Create(long repositoryId, NewIssue newIssue)
         /// </param>
         public Task<Issue> Update(string owner, string name, int number, IssueUpdate issueUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(issueUpdate, "issueUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
             return ApiConnection.Patch<Issue>(ApiUrls.Issue(owner, name, number), issueUpdate);
         }
@@ -462,7 +462,7 @@ public Task<Issue> Update(string owner, string name, int number, IssueUpdate iss
         /// </param>
         public Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate)
         {
-            Ensure.ArgumentNotNull(issueUpdate, "issueUpdate");
+            Ensure.ArgumentNotNull(issueUpdate, nameof(issueUpdate));
 
             return ApiConnection.Patch<Issue>(ApiUrls.Issue(repositoryId, number), issueUpdate);
         }
@@ -476,8 +476,8 @@ public Task<Issue> Update(long repositoryId, int number, IssueUpdate issueUpdate
         /// <param name="number">The issue number</param>
         public Task Lock(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Put<Issue>(ApiUrls.IssueLock(owner, name, number), new object(), null, AcceptHeaders.IssueLockingUnlockingApiPreview);
         }
@@ -502,8 +502,8 @@ public Task Lock(long repositoryId, int number)
         /// <param name="number">The issue number</param>
         public Task Unlock(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.IssueLock(owner, name, number), new object(), AcceptHeaders.IssueLockingUnlockingApiPreview);
         }
diff --git a/Octokit/Clients/IssuesEventsClient.cs b/Octokit/Clients/IssuesEventsClient.cs
index f6d3e71424..d27f92e34d 100644
--- a/Octokit/Clients/IssuesEventsClient.cs
+++ b/Octokit/Clients/IssuesEventsClient.cs
@@ -26,8 +26,8 @@ public IssuesEventsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="number">The issue number</param>
         public Task<IReadOnlyList<EventInfo>> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -57,9 +57,9 @@ public Task<IReadOnlyList<EventInfo>> GetAllForIssue(long repositoryId, int numb
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<EventInfo>> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<EventInfo>(ApiUrls.IssuesEvents(owner, name, number), options);
         }
@@ -75,7 +75,7 @@ public Task<IReadOnlyList<EventInfo>> GetAllForIssue(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<EventInfo>> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<EventInfo>(ApiUrls.IssuesEvents(repositoryId, number), options);
         }
@@ -90,8 +90,8 @@ public Task<IReadOnlyList<EventInfo>> GetAllForIssue(long repositoryId, int numb
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -119,9 +119,9 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(owner, name), options);
         }
@@ -136,7 +136,7 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(string owner, string
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(repositoryId), options);
         }
@@ -152,8 +152,8 @@ public Task<IReadOnlyList<IssueEvent>> GetAllForRepository(long repositoryId, Ap
         /// <param name="number">The event id</param>
         public Task<IssueEvent> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<IssueEvent>(ApiUrls.IssuesEvent(owner, name, number));
         }
diff --git a/Octokit/Clients/IssuesLabelsClient.cs b/Octokit/Clients/IssuesLabelsClient.cs
index 4e4c978d40..964d567516 100644
--- a/Octokit/Clients/IssuesLabelsClient.cs
+++ b/Octokit/Clients/IssuesLabelsClient.cs
@@ -27,8 +27,8 @@ public IssuesLabelsClient(IApiConnection apiConnection)
         /// <param name="number">The number of the issue</param>
         public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForIssue(owner, name, number, ApiOptions.None);
         }
@@ -58,9 +58,9 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.IssueLabels(owner, name, number), options);
         }
@@ -76,7 +76,7 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(string owner, string name, int
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.IssueLabels(repositoryId, number), options);
         }
@@ -91,8 +91,8 @@ public Task<IReadOnlyList<Label>> GetAllForIssue(long repositoryId, int number,
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Label>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -120,9 +120,9 @@ public Task<IReadOnlyList<Label>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.Labels(owner, name), options);
         }
@@ -137,7 +137,7 @@ public Task<IReadOnlyList<Label>> GetAllForRepository(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.Labels(repositoryId), options);
         }
@@ -153,8 +153,8 @@ public Task<IReadOnlyList<Label>> GetAllForRepository(long repositoryId, ApiOpti
         /// <param name="number">The number of the milestone</param>
         public Task<IReadOnlyList<Label>> GetAllForMilestone(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForMilestone(owner, name, number, ApiOptions.None);
         }
@@ -184,9 +184,9 @@ public Task<IReadOnlyList<Label>> GetAllForMilestone(long repositoryId, int numb
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForMilestone(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.MilestoneLabels(owner, name, number), options);
         }
@@ -202,7 +202,7 @@ public Task<IReadOnlyList<Label>> GetAllForMilestone(string owner, string name,
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Label>> GetAllForMilestone(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Label>(ApiUrls.MilestoneLabels(repositoryId, number), options);
         }
@@ -218,9 +218,9 @@ public Task<IReadOnlyList<Label>> GetAllForMilestone(long repositoryId, int numb
         /// <param name="labelName">The name of the label</param>
         public Task<Label> Get(string owner, string name, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Get<Label>(ApiUrls.Label(owner, name, labelName));
         }
@@ -235,7 +235,7 @@ public Task<Label> Get(string owner, string name, string labelName)
         /// <param name="labelName">The name of the label</param>
         public Task<Label> Get(long repositoryId, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Get<Label>(ApiUrls.Label(repositoryId, labelName));
         }
@@ -251,9 +251,9 @@ public Task<Label> Get(long repositoryId, string labelName)
         /// <param name="labelName">The name of the label</param>
         public Task Delete(string owner, string name, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Delete(ApiUrls.Label(owner, name, labelName));
         }
@@ -268,7 +268,7 @@ public Task Delete(string owner, string name, string labelName)
         /// <param name="labelName">The name of the label</param>
         public Task Delete(long repositoryId, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Delete(ApiUrls.Label(repositoryId, labelName));
         }
@@ -284,9 +284,9 @@ public Task Delete(long repositoryId, string labelName)
         /// <param name="newLabel">The data for the label to be created</param>
         public Task<Label> Create(string owner, string name, NewLabel newLabel)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newLabel, "newLabel");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newLabel, nameof(newLabel));
 
             return ApiConnection.Post<Label>(ApiUrls.Labels(owner, name), newLabel);
         }
@@ -301,7 +301,7 @@ public Task<Label> Create(string owner, string name, NewLabel newLabel)
         /// <param name="newLabel">The data for the label to be created</param>
         public Task<Label> Create(long repositoryId, NewLabel newLabel)
         {
-            Ensure.ArgumentNotNull(newLabel, "newLabel");
+            Ensure.ArgumentNotNull(newLabel, nameof(newLabel));
 
             return ApiConnection.Post<Label>(ApiUrls.Labels(repositoryId), newLabel);
         }
@@ -318,10 +318,10 @@ public Task<Label> Create(long repositoryId, NewLabel newLabel)
         /// <param name="labelUpdate">The data for the label to be updated</param>
         public Task<Label> Update(string owner, string name, string labelName, LabelUpdate labelUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
-            Ensure.ArgumentNotNull(labelUpdate, "labelUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
+            Ensure.ArgumentNotNull(labelUpdate, nameof(labelUpdate));
 
             return ApiConnection.Post<Label>(ApiUrls.Label(owner, name, labelName), labelUpdate);
         }
@@ -337,8 +337,8 @@ public Task<Label> Update(string owner, string name, string labelName, LabelUpda
         /// <param name="labelUpdate">The data for the label to be updated</param>
         public Task<Label> Update(long repositoryId, string labelName, LabelUpdate labelUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
-            Ensure.ArgumentNotNull(labelUpdate, "labelUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
+            Ensure.ArgumentNotNull(labelUpdate, nameof(labelUpdate));
 
             return ApiConnection.Post<Label>(ApiUrls.Label(repositoryId, labelName), labelUpdate);
         }
@@ -355,9 +355,9 @@ public Task<Label> Update(long repositoryId, string labelName, LabelUpdate label
         /// <param name="labels">The names of the labels to add</param>
         public Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, int number, string[] labels)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return ApiConnection.Post<IReadOnlyList<Label>>(ApiUrls.IssueLabels(owner, name, number), labels);
         }
@@ -373,7 +373,7 @@ public Task<IReadOnlyList<Label>> AddToIssue(string owner, string name, int numb
         /// <param name="labels">The names of the labels to add</param>
         public Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, int number, string[] labels)
         {
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return ApiConnection.Post<IReadOnlyList<Label>>(ApiUrls.IssueLabels(repositoryId, number), labels);
         }
@@ -390,9 +390,9 @@ public Task<IReadOnlyList<Label>> AddToIssue(long repositoryId, int number, stri
         /// <param name="labelName">The name of the label to remove</param>
         public Task RemoveFromIssue(string owner, string name, int number, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Delete(ApiUrls.IssueLabel(owner, name, number, labelName));
         }
@@ -408,7 +408,7 @@ public Task RemoveFromIssue(string owner, string name, int number, string labelN
         /// <param name="labelName">The name of the label to remove</param>
         public Task RemoveFromIssue(long repositoryId, int number, string labelName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(labelName, "labelName");
+            Ensure.ArgumentNotNullOrEmptyString(labelName, nameof(labelName));
 
             return ApiConnection.Delete(ApiUrls.IssueLabel(repositoryId, number, labelName));
         }
@@ -425,9 +425,9 @@ public Task RemoveFromIssue(long repositoryId, int number, string labelName)
         /// <param name="labels">The names of the labels to set</param>
         public Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name, int number, string[] labels)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return ApiConnection.Put<IReadOnlyList<Label>>(ApiUrls.IssueLabels(owner, name, number), labels);
         }
@@ -443,7 +443,7 @@ public Task<IReadOnlyList<Label>> ReplaceAllForIssue(string owner, string name,
         /// <param name="labels">The names of the labels to set</param>
         public Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, int number, string[] labels)
         {
-            Ensure.ArgumentNotNull(labels, "labels");
+            Ensure.ArgumentNotNull(labels, nameof(labels));
 
             return ApiConnection.Put<IReadOnlyList<Label>>(ApiUrls.IssueLabels(repositoryId, number), labels);
         }
@@ -459,8 +459,8 @@ public Task<IReadOnlyList<Label>> ReplaceAllForIssue(long repositoryId, int numb
         /// <param name="number">The number of the issue</param>
         public Task RemoveAllFromIssue(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.IssueLabels(owner, name, number));
         }
diff --git a/Octokit/Clients/MergingClient.cs b/Octokit/Clients/MergingClient.cs
index 6cc662ffb8..b366eaceb5 100644
--- a/Octokit/Clients/MergingClient.cs
+++ b/Octokit/Clients/MergingClient.cs
@@ -30,9 +30,9 @@ public MergingClient(IApiConnection apiConnection) : base(apiConnection)
         /// <returns></returns>
         public Task<Merge> Create(string owner, string name, NewMerge merge)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(merge, "merge");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(merge, nameof(merge));
 
             return ApiConnection.Post<Merge>(ApiUrls.CreateMerge(owner, name), merge);
         }
@@ -48,7 +48,7 @@ public Task<Merge> Create(string owner, string name, NewMerge merge)
         /// <returns></returns>
         public Task<Merge> Create(long repositoryId, NewMerge merge)
         {
-            Ensure.ArgumentNotNull(merge, "merge");
+            Ensure.ArgumentNotNull(merge, nameof(merge));
 
             return ApiConnection.Post<Merge>(ApiUrls.CreateMerge(repositoryId), merge);
         }
diff --git a/Octokit/Clients/MigrationsClient.cs b/Octokit/Clients/MigrationsClient.cs
index 532922f977..d4475207c7 100644
--- a/Octokit/Clients/MigrationsClient.cs
+++ b/Octokit/Clients/MigrationsClient.cs
@@ -31,8 +31,8 @@ public MigrationsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <returns>The started migration.</returns>
         public async Task<Migration> Start(string org, StartMigrationRequest migration)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(migration, "migration");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(migration, nameof(migration));
 
             var endpoint = ApiUrls.EnterpriseMigrations(org);
 
@@ -49,7 +49,7 @@ public async Task<Migration> Start(string org, StartMigrationRequest migration)
         /// <returns>List of most recent <see cref="Migration"/>s.</returns>
         public async Task<List<Migration>> GetAll(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             var endpoint = ApiUrls.EnterpriseMigrations(org);
 
@@ -67,7 +67,7 @@ public async Task<List<Migration>> GetAll(string org)
         /// <returns>A <see cref="Migration"/> object representing the state of migration.</returns>
         public async Task<Migration> Get(string org, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             var endpoint = ApiUrls.EnterpriseMigrationById(org, id);
 
@@ -85,7 +85,7 @@ public async Task<Migration> Get(string org, int id)
         /// <returns>The binary contents of the archive as a byte array.</returns>
         public async Task<byte[]> GetArchive(string org, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             var endpoint = ApiUrls.EnterpriseMigrationArchive(org, id);
             var response = await Connection.Get<byte[]>(endpoint, null, AcceptHeaders.MigrationsApiPreview).ConfigureAwait(false);
@@ -104,7 +104,7 @@ public async Task<byte[]> GetArchive(string org, int id)
         /// <returns></returns>
         public Task DeleteArchive(string org, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             var endpoint = ApiUrls.EnterpriseMigrationArchive(org, id);
 
@@ -123,8 +123,8 @@ public Task DeleteArchive(string org, int id)
         /// <returns></returns>
         public Task UnlockRepository(string org, int id, string repo)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
 
             var endpoint = ApiUrls.EnterpriseMigrationUnlockRepository(org, id, repo);
 
diff --git a/Octokit/Clients/MilestonesClient.cs b/Octokit/Clients/MilestonesClient.cs
index c0842d0fa7..6496da65d9 100644
--- a/Octokit/Clients/MilestonesClient.cs
+++ b/Octokit/Clients/MilestonesClient.cs
@@ -28,8 +28,8 @@ public MilestonesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <returns></returns>
         public Task<Milestone> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<Milestone>(ApiUrls.Milestone(owner, name, number));
         }
@@ -57,8 +57,8 @@ public Task<Milestone> Get(long repositoryId, int number)
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, new MilestoneRequest());
         }
@@ -88,9 +88,9 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId)
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new MilestoneRequest(), options);
         }
@@ -106,7 +106,7 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string n
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new MilestoneRequest(), options);
         }
@@ -123,9 +123,9 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, Api
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string name, MilestoneRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -141,7 +141,7 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string n
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, MilestoneRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -159,10 +159,10 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, Mil
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string name, MilestoneRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Milestone>(ApiUrls.Milestones(owner, name),
                 request.ToParametersDictionary(), options);
@@ -180,8 +180,8 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(string owner, string n
         /// <returns></returns>
         public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, MilestoneRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Milestone>(ApiUrls.Milestones(repositoryId),
                 request.ToParametersDictionary(), options);
@@ -198,9 +198,9 @@ public Task<IReadOnlyList<Milestone>> GetAllForRepository(long repositoryId, Mil
         /// <returns></returns>
         public Task<Milestone> Create(string owner, string name, NewMilestone newMilestone)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newMilestone, "newMilestone");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newMilestone, nameof(newMilestone));
 
             return ApiConnection.Post<Milestone>(ApiUrls.Milestones(owner, name), newMilestone);
         }
@@ -215,7 +215,7 @@ public Task<Milestone> Create(string owner, string name, NewMilestone newMilesto
         /// <returns></returns>
         public Task<Milestone> Create(long repositoryId, NewMilestone newMilestone)
         {
-            Ensure.ArgumentNotNull(newMilestone, "newMilestone");
+            Ensure.ArgumentNotNull(newMilestone, nameof(newMilestone));
 
             return ApiConnection.Post<Milestone>(ApiUrls.Milestones(repositoryId), newMilestone);
         }
@@ -233,9 +233,9 @@ public Task<Milestone> Create(long repositoryId, NewMilestone newMilestone)
         /// <returns></returns>
         public Task<Milestone> Update(string owner, string name, int number, MilestoneUpdate milestoneUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(milestoneUpdate, "milestoneUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(milestoneUpdate, nameof(milestoneUpdate));
 
             return ApiConnection.Patch<Milestone>(ApiUrls.Milestone(owner, name, number), milestoneUpdate);
         }
@@ -252,7 +252,7 @@ public Task<Milestone> Update(string owner, string name, int number, MilestoneUp
         /// <returns></returns>
         public Task<Milestone> Update(long repositoryId, int number, MilestoneUpdate milestoneUpdate)
         {
-            Ensure.ArgumentNotNull(milestoneUpdate, "milestoneUpdate");
+            Ensure.ArgumentNotNull(milestoneUpdate, nameof(milestoneUpdate));
 
             return ApiConnection.Patch<Milestone>(ApiUrls.Milestone(repositoryId, number), milestoneUpdate);
         }
@@ -268,8 +268,8 @@ public Task<Milestone> Update(long repositoryId, int number, MilestoneUpdate mil
         /// <returns></returns>
         public Task Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.Milestone(owner, name, number));
         }
diff --git a/Octokit/Clients/MiscellaneousClient.cs b/Octokit/Clients/MiscellaneousClient.cs
index da76b1db37..9fd9bcb93c 100644
--- a/Octokit/Clients/MiscellaneousClient.cs
+++ b/Octokit/Clients/MiscellaneousClient.cs
@@ -23,7 +23,7 @@ public class MiscellaneousClient : IMiscellaneousClient
         /// <param name="connection">An API connection</param>
         public MiscellaneousClient(IConnection connection)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
 
             _connection = connection;
         }
@@ -86,7 +86,7 @@ public async Task<IReadOnlyList<string>> GetAllGitIgnoreTemplates()
         /// <returns>A template and its source</returns>
         public async Task<GitIgnoreTemplate> GetGitIgnoreTemplate(string templateName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(templateName, "templateName");
+            Ensure.ArgumentNotNullOrEmptyString(templateName, nameof(templateName));
 
             var endpoint = new Uri("gitignore/templates/" + Uri.EscapeUriString(templateName), UriKind.Relative);
 
diff --git a/Octokit/Clients/NotificationsClient.cs b/Octokit/Clients/NotificationsClient.cs
index 9a2c8c065f..43d7bfada3 100644
--- a/Octokit/Clients/NotificationsClient.cs
+++ b/Octokit/Clients/NotificationsClient.cs
@@ -35,7 +35,7 @@ public Task<IReadOnlyList<Notification>> GetAllForCurrent()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(), options);
         }
@@ -47,7 +47,7 @@ public Task<IReadOnlyList<Notification>> GetAllForCurrent(ApiOptions options)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForCurrent(NotificationsRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -60,8 +60,8 @@ public Task<IReadOnlyList<Notification>> GetAllForCurrent(NotificationsRequest r
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForCurrent(NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(), request.ToParametersDictionary(), options);
         }
@@ -74,8 +74,8 @@ public Task<IReadOnlyList<Notification>> GetAllForCurrent(NotificationsRequest r
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -99,9 +99,9 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(owner, name), options);
         }
@@ -114,7 +114,7 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, strin
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(repositoryId), options);
         }
@@ -128,9 +128,9 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, string name, NotificationsRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -143,7 +143,7 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, strin
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId, NotificationsRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -158,10 +158,10 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId,
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, string name, NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(owner, name), request.ToParametersDictionary(), options);
         }
@@ -175,8 +175,8 @@ public Task<IReadOnlyList<Notification>> GetAllForRepository(string owner, strin
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Notification>> GetAllForRepository(long repositoryId, NotificationsRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Notification>(ApiUrls.Notifications(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -197,7 +197,7 @@ public Task MarkAsRead()
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-as-read</remarks>
         public Task MarkAsRead(MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return ApiConnection.Put<object>(ApiUrls.Notifications(), markAsReadRequest);
         }
@@ -210,8 +210,8 @@ public Task MarkAsRead(MarkAsReadRequest markAsReadRequest)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public Task MarkAsReadForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Put<object>(ApiUrls.Notifications(owner, name), new object());
         }
@@ -235,9 +235,9 @@ public Task MarkAsReadForRepository(long repositoryId)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public Task MarkAsReadForRepository(string owner, string name, MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return ApiConnection.Put<object>(ApiUrls.Notifications(owner, name), markAsReadRequest);
         }
@@ -250,7 +250,7 @@ public Task MarkAsReadForRepository(string owner, string name, MarkAsReadRequest
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-notifications-as-read-in-a-repository</remarks>
         public Task MarkAsReadForRepository(long repositoryId, MarkAsReadRequest markAsReadRequest)
         {
-            Ensure.ArgumentNotNull(markAsReadRequest, "markAsReadRequest");
+            Ensure.ArgumentNotNull(markAsReadRequest, nameof(markAsReadRequest));
 
             return ApiConnection.Put<object>(ApiUrls.Notifications(repositoryId), markAsReadRequest);
         }
@@ -293,7 +293,7 @@ public Task<ThreadSubscription> GetThreadSubscription(int id)
         /// <remarks>http://developer.github.com/v3/activity/notifications/#set-a-thread-subscription</remarks>
         public Task<ThreadSubscription> SetThreadSubscription(int id, NewThreadSubscription threadSubscription)
         {
-            Ensure.ArgumentNotNull(threadSubscription, "threadSubscription");
+            Ensure.ArgumentNotNull(threadSubscription, nameof(threadSubscription));
 
             return ApiConnection.Put<ThreadSubscription>(ApiUrls.NotificationSubscription(id), threadSubscription);
         }
diff --git a/Octokit/Clients/OAuthClient.cs b/Octokit/Clients/OAuthClient.cs
index d163ae3bdd..437c8f2c17 100644
--- a/Octokit/Clients/OAuthClient.cs
+++ b/Octokit/Clients/OAuthClient.cs
@@ -18,7 +18,7 @@ public class OauthClient : IOauthClient
         /// <param name="connection">The underlying connection to use</param>
         public OauthClient(IConnection connection)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
 
             this.connection = connection;
             var baseAddress = connection.BaseAddress ?? GitHubClient.GitHubDotComUrl;
@@ -38,7 +38,7 @@ public OauthClient(IConnection connection)
         /// <returns></returns>
         public Uri GetGitHubLoginUrl(OauthLoginRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return new Uri(hostAddress, ApiUrls.OauthAuthorize())
                 .ApplyParameters(request.ToParametersDictionary());
@@ -58,7 +58,7 @@ public Uri GetGitHubLoginUrl(OauthLoginRequest request)
         /// <returns></returns>
         public async Task<OauthToken> CreateAccessToken(OauthTokenRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var endPoint = ApiUrls.OauthAccessToken();
 
diff --git a/Octokit/Clients/OrganizationMembersClient.cs b/Octokit/Clients/OrganizationMembersClient.cs
index 1a3730bf55..e735bbcb26 100644
--- a/Octokit/Clients/OrganizationMembersClient.cs
+++ b/Octokit/Clients/OrganizationMembersClient.cs
@@ -75,7 +75,7 @@ public OrganizationMembersClient(IApiConnection apiConnection) : base(apiConnect
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, ApiOptions.None);
         }
@@ -103,8 +103,8 @@ public Task<IReadOnlyList<User>> GetAll(string org)
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Members(org), options);
         }
@@ -132,7 +132,7 @@ public Task<IReadOnlyList<User>> GetAll(string org, ApiOptions options)
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter filter)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, filter, ApiOptions.None);
         }
@@ -161,8 +161,8 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter fi
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter filter, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Members(org, filter), options);
         }
@@ -190,7 +190,7 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter fi
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersRole role)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, role, ApiOptions.None);
         }
@@ -219,8 +219,8 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersRole role
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersRole role, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Members(org, role), options);
         }
@@ -249,7 +249,7 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersRole role
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter filter, OrganizationMembersRole role)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAll(org, filter, role, ApiOptions.None);
         }
@@ -279,8 +279,8 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter fi
         /// <returns>The users</returns>
         public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter filter, OrganizationMembersRole role, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Members(org, filter, role), options);
         }
@@ -293,7 +293,7 @@ public Task<IReadOnlyList<User>> GetAll(string org, OrganizationMembersFilter fi
         /// <returns></returns>
         public Task<IReadOnlyList<User>> GetAllPublic(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return GetAllPublic(org, ApiOptions.None);
         }
@@ -307,8 +307,8 @@ public Task<IReadOnlyList<User>> GetAllPublic(string org)
         /// <returns></returns>
         public Task<IReadOnlyList<User>> GetAllPublic(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.PublicMembers(org), options);
         }
@@ -325,8 +325,8 @@ public Task<IReadOnlyList<User>> GetAllPublic(string org, ApiOptions options)
         /// <returns></returns>
         public async Task<bool> CheckMember(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -358,8 +358,8 @@ public async Task<bool> CheckMember(string org, string user)
         /// <returns></returns>
         public async Task<bool> CheckMemberPublic(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -386,8 +386,8 @@ public async Task<bool> CheckMemberPublic(string org, string user)
         /// <returns></returns>
         public Task Delete(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Delete("orgs/{0}/members/{1}".FormatUri(org, user));
         }
@@ -405,8 +405,8 @@ public Task Delete(string org, string user)
         /// <returns></returns>
         public async Task<bool> Publicize(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -437,8 +437,8 @@ public async Task<bool> Publicize(string org, string user)
         /// <returns></returns>
         public Task Conceal(string org, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Delete(ApiUrls.OrganizationMembership(org, user));
         }
diff --git a/Octokit/Clients/OrganizationsClient.cs b/Octokit/Clients/OrganizationsClient.cs
index 661189310d..b59eec8bb9 100644
--- a/Octokit/Clients/OrganizationsClient.cs
+++ b/Octokit/Clients/OrganizationsClient.cs
@@ -46,7 +46,7 @@ public OrganizationsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <returns>The specified <see cref="Organization"/>.</returns>
         public Task<Organization> Get(string org)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
 
             return ApiConnection.Get<Organization>(ApiUrls.Organization(org));
         }
@@ -69,7 +69,7 @@ public Task<IReadOnlyList<Organization>> GetAllForCurrent()
         /// <returns>A list of the current user's <see cref="Organization"/>s.</returns>
         public Task<IReadOnlyList<Organization>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Organization>(ApiUrls.UserOrganizations(), options);
         }
@@ -83,7 +83,7 @@ public Task<IReadOnlyList<Organization>> GetAllForCurrent(ApiOptions options)
         [Obsolete("Please use OrganizationsClient.GetAllForUser() instead. This method will be removed in a future version")]
         public Task<IReadOnlyList<Organization>> GetAll(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAll(user, ApiOptions.None);
         }
@@ -98,8 +98,8 @@ public Task<IReadOnlyList<Organization>> GetAll(string user)
         [Obsolete("Please use OrganizationsClient.GetAllForUser() instead. This method will be removed in a future version")]
         public Task<IReadOnlyList<Organization>> GetAll(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Organization>(ApiUrls.UserOrganizations(user), options);
         }
@@ -112,7 +112,7 @@ public Task<IReadOnlyList<Organization>> GetAll(string user, ApiOptions options)
         /// <returns>A list of the specified user's <see cref="Organization"/>s.</returns>
         public Task<IReadOnlyList<Organization>> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -126,8 +126,8 @@ public Task<IReadOnlyList<Organization>> GetAllForUser(string user)
         /// <returns>A list of the specified user's <see cref="Organization"/>s.</returns>
         public Task<IReadOnlyList<Organization>> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Organization>(ApiUrls.UserOrganizations(user), options);
         }
@@ -151,7 +151,7 @@ public Task<IReadOnlyList<Organization>> GetAll()
         /// <returns>A list of <see cref="Organization"/>s.</returns>
         public Task<IReadOnlyList<Organization>> GetAll(OrganizationRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var url = ApiUrls.AllOrganizations(request.Since);
 
@@ -167,8 +167,8 @@ public Task<IReadOnlyList<Organization>> GetAll(OrganizationRequest request)
         /// <returns>A <see cref="Organization"/></returns>
         public Task<Organization> Update(string organizationName, OrganizationUpdate updateRequest)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organizationName, "organizationName");
-            Ensure.ArgumentNotNull(updateRequest, "updateRequest");
+            Ensure.ArgumentNotNullOrEmptyString(organizationName, nameof(organizationName));
+            Ensure.ArgumentNotNull(updateRequest, nameof(updateRequest));
 
             var updateUri = new Uri("orgs/" + organizationName, UriKind.Relative);
 
diff --git a/Octokit/Clients/ProjectCardsClient.cs b/Octokit/Clients/ProjectCardsClient.cs
index 2bae421736..a16cd58086 100644
--- a/Octokit/Clients/ProjectCardsClient.cs
+++ b/Octokit/Clients/ProjectCardsClient.cs
@@ -39,7 +39,7 @@ public Task<IReadOnlyList<ProjectCard>> GetAll(int columnId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<ProjectCard>> GetAll(int columnId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<ProjectCard>(ApiUrls.ProjectCards(columnId), new Dictionary<string, string>(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -66,7 +66,7 @@ public Task<ProjectCard> Get(int id)
         /// <param name="newProjectCard">The card to create</param>
         public Task<ProjectCard> Create(int columnId, NewProjectCard newProjectCard)
         {
-            Ensure.ArgumentNotNull(newProjectCard, "newProjectCard");
+            Ensure.ArgumentNotNull(newProjectCard, nameof(newProjectCard));
 
             return ApiConnection.Post<ProjectCard>(ApiUrls.ProjectCards(columnId), newProjectCard, AcceptHeaders.ProjectsApiPreview);
         }
@@ -81,7 +81,7 @@ public Task<ProjectCard> Create(int columnId, NewProjectCard newProjectCard)
         /// <param name="projectCardUpdate">New values to update the card with</param>
         public Task<ProjectCard> Update(int id, ProjectCardUpdate projectCardUpdate)
         {
-            Ensure.ArgumentNotNull(projectCardUpdate, "projectCardUpdate");
+            Ensure.ArgumentNotNull(projectCardUpdate, nameof(projectCardUpdate));
 
             return ApiConnection.Patch<ProjectCard>(ApiUrls.ProjectCard(id), projectCardUpdate, AcceptHeaders.ProjectsApiPreview);
         }
@@ -118,7 +118,7 @@ public async Task<bool> Delete(int id)
         /// <param name="position">The position to move the card</param>
         public async Task<bool> Move(int id, ProjectCardMove position)
         {
-            Ensure.ArgumentNotNull(position, "position");
+            Ensure.ArgumentNotNull(position, nameof(position));
 
             var endpoint = ApiUrls.ProjectCardMove(id);
             try
diff --git a/Octokit/Clients/ProjectColumnsClient.cs b/Octokit/Clients/ProjectColumnsClient.cs
index 3b3015404e..0ecb729592 100644
--- a/Octokit/Clients/ProjectColumnsClient.cs
+++ b/Octokit/Clients/ProjectColumnsClient.cs
@@ -39,7 +39,7 @@ public Task<IReadOnlyList<ProjectColumn>> GetAll(int projectId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<ProjectColumn>> GetAll(int projectId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<ProjectColumn>(ApiUrls.ProjectColumns(projectId), new Dictionary<string, string>(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -66,7 +66,7 @@ public Task<ProjectColumn> Get(int id)
         /// <param name="newProjectColumn">The column to create</param>
         public Task<ProjectColumn> Create(int projectId, NewProjectColumn newProjectColumn)
         {
-            Ensure.ArgumentNotNull(newProjectColumn, "newProjectColumn");
+            Ensure.ArgumentNotNull(newProjectColumn, nameof(newProjectColumn));
 
             return ApiConnection.Post<ProjectColumn>(ApiUrls.ProjectColumns(projectId), newProjectColumn, AcceptHeaders.ProjectsApiPreview);
         }
@@ -81,7 +81,7 @@ public Task<ProjectColumn> Create(int projectId, NewProjectColumn newProjectColu
         /// <param name="projectColumnUpdate">New values to update the column with</param>
         public Task<ProjectColumn> Update(int id, ProjectColumnUpdate projectColumnUpdate)
         {
-            Ensure.ArgumentNotNull(projectColumnUpdate, "projectColumnUpdate");
+            Ensure.ArgumentNotNull(projectColumnUpdate, nameof(projectColumnUpdate));
 
             return ApiConnection.Patch<ProjectColumn>(ApiUrls.ProjectColumn(id), projectColumnUpdate, AcceptHeaders.ProjectsApiPreview);
         }
@@ -117,7 +117,7 @@ public async Task<bool> Delete(int id)
         /// <param name="position">The position to move the column</param>
         public async Task<bool> Move(int id, ProjectColumnMove position)
         {
-            Ensure.ArgumentNotNull(position, "position");
+            Ensure.ArgumentNotNull(position, nameof(position));
 
             var endpoint = ApiUrls.ProjectColumnMove(id);
             try
diff --git a/Octokit/Clients/ProjectsClient.cs b/Octokit/Clients/ProjectsClient.cs
index 862ac82ccc..5afd714461 100644
--- a/Octokit/Clients/ProjectsClient.cs
+++ b/Octokit/Clients/ProjectsClient.cs
@@ -44,9 +44,9 @@ public Task<IReadOnlyList<Project>> GetAllForRepository(string owner, string nam
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Project>(ApiUrls.RepositoryProjects(owner, name), new Dictionary<string, string>(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -77,10 +77,10 @@ public Task<IReadOnlyList<Project>> GetAllForRepository(string owner, string nam
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForRepository(string owner, string name, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Project>(ApiUrls.RepositoryProjects(owner, name), request.ToParametersDictionary(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -107,7 +107,7 @@ public Task<IReadOnlyList<Project>> GetAllForRepository(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Project>(ApiUrls.RepositoryProjects(repositoryId), new Dictionary<string, string>(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -136,8 +136,8 @@ public Task<IReadOnlyList<Project>> GetAllForRepository(long repositoryId, Proje
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForRepository(long repositoryId, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Project>(ApiUrls.RepositoryProjects(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -164,8 +164,9 @@ public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
+
 
             return ApiConnection.GetAll<Project>(ApiUrls.OrganizationProjects(organization), new Dictionary<string, string>(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -180,8 +181,8 @@ public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization, A
         /// <param name="request">Used to filter the list of projects returned</param>
         public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization, ProjectRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForOrganization(organization, request, ApiOptions.None);
         }
@@ -197,9 +198,9 @@ public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization, P
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Project>> GetAllForOrganization(string organization, ProjectRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Project>(ApiUrls.OrganizationProjects(organization), request.ToParametersDictionary(), AcceptHeaders.ProjectsApiPreview, options);
         }
@@ -226,7 +227,7 @@ public Task<Project> Get(int id)
         /// <param name="newProject">The new project to create for this repository</param>
         public Task<Project> CreateForRepository(long repositoryId, NewProject newProject)
         {
-            Ensure.ArgumentNotNull(newProject, "newProject");
+            Ensure.ArgumentNotNull(newProject, nameof(newProject));
 
             return ApiConnection.Post<Project>(ApiUrls.RepositoryProjects(repositoryId), newProject, AcceptHeaders.ProjectsApiPreview);
         }
@@ -241,8 +242,8 @@ public Task<Project> CreateForRepository(long repositoryId, NewProject newProjec
         /// <param name="newProject">The new project to create for this repository</param>
         public Task<Project> CreateForOrganization(string organization, NewProject newProject)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(newProject, "newProject");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(newProject, nameof(newProject));
 
             return ApiConnection.Post<Project>(ApiUrls.OrganizationProjects(organization), newProject, AcceptHeaders.ProjectsApiPreview);
         }
@@ -257,7 +258,7 @@ public Task<Project> CreateForOrganization(string organization, NewProject newPr
         /// <param name="projectUpdate">The modified project</param>
         public Task<Project> Update(int id, ProjectUpdate projectUpdate)
         {
-            Ensure.ArgumentNotNull(projectUpdate, "projectUpdate");
+            Ensure.ArgumentNotNull(projectUpdate, nameof(projectUpdate));
 
             return ApiConnection.Patch<Project>(ApiUrls.Project(id), projectUpdate, AcceptHeaders.ProjectsApiPreview);
         }
diff --git a/Octokit/Clients/PullRequestReviewCommentReactionsClient.cs b/Octokit/Clients/PullRequestReviewCommentReactionsClient.cs
index 71e80c1cbe..251d9acdd0 100644
--- a/Octokit/Clients/PullRequestReviewCommentReactionsClient.cs
+++ b/Octokit/Clients/PullRequestReviewCommentReactionsClient.cs
@@ -25,8 +25,8 @@ public PullRequestReviewCommentReactionsClient(IApiConnection apiConnection)
         /// <param name="number">The comment id</param>        
         public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<Reaction>(ApiUrls.PullRequestReviewCommentReaction(owner, name, number), AcceptHeaders.ReactionsPreview);
         }
@@ -52,9 +52,9 @@ public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number)
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReaction(owner, name, number), reaction, AcceptHeaders.ReactionsPreview);
         }
@@ -68,7 +68,7 @@ public Task<Reaction> Create(string owner, string name, int number, NewReaction
         /// <param name="reaction">The reaction to create</param>
         public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
         {
-            Ensure.ArgumentNotNull(reaction, "reaction");
+            Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
             return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReaction(repositoryId, number), reaction, AcceptHeaders.ReactionsPreview);
         }
diff --git a/Octokit/Clients/PullRequestReviewCommentsClient.cs b/Octokit/Clients/PullRequestReviewCommentsClient.cs
index dd3cc74947..49759d6384 100644
--- a/Octokit/Clients/PullRequestReviewCommentsClient.cs
+++ b/Octokit/Clients/PullRequestReviewCommentsClient.cs
@@ -26,8 +26,8 @@ public PullRequestReviewCommentsClient(IApiConnection apiConnection)
         /// <param name="number">The pull request number</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, number, ApiOptions.None);
         }
@@ -53,9 +53,9 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, i
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(owner, name, number), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -69,7 +69,7 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(repositoryId, number), options);
         }
@@ -82,8 +82,8 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, i
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, new PullRequestReviewCommentRequest(), ApiOptions.None);
         }
@@ -107,9 +107,9 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long re
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(owner, name, new PullRequestReviewCommentRequest(), options);
         }
@@ -122,7 +122,7 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllForRepository(repositoryId, new PullRequestReviewCommentRequest(), options);
         }
@@ -136,9 +136,9 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long re
         /// <param name="request">The sorting <see cref="PullRequestReviewCommentRequest">parameters</see></param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string owner, string name, PullRequestReviewCommentRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(owner, name, request, ApiOptions.None);
         }
@@ -151,7 +151,7 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string
         /// <param name="request">The sorting <see cref="PullRequestReviewCommentRequest">parameters</see></param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long repositoryId, PullRequestReviewCommentRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForRepository(repositoryId, request, ApiOptions.None);
         }
@@ -166,10 +166,10 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long re
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string owner, string name, PullRequestReviewCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewCommentsRepository(owner, name), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -183,8 +183,8 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(string
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long repositoryId, PullRequestReviewCommentRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewCommentsRepository(repositoryId), request.ToParametersDictionary(), AcceptHeaders.ReactionsPreview, options);
         }
@@ -198,8 +198,8 @@ public Task<IReadOnlyList<PullRequestReviewComment>> GetAllForRepository(long re
         /// <param name="number">The pull request review comment number</param>
         public Task<PullRequestReviewComment> GetComment(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(owner, name, number), new Dictionary<string, string>(), AcceptHeaders.ReactionsPreview);
         }
@@ -225,9 +225,9 @@ public Task<PullRequestReviewComment> GetComment(long repositoryId, int number)
         /// <param name="comment">The comment</param>
         public async Task<PullRequestReviewComment> Create(string owner, string name, int number, PullRequestReviewCommentCreate comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             var endpoint = ApiUrls.PullRequestReviewComments(owner, name, number);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
@@ -249,7 +249,7 @@ public async Task<PullRequestReviewComment> Create(string owner, string name, in
         /// <param name="comment">The comment</param>
         public async Task<PullRequestReviewComment> Create(long repositoryId, int number, PullRequestReviewCommentCreate comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, number);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
@@ -272,9 +272,9 @@ public async Task<PullRequestReviewComment> Create(long repositoryId, int number
         /// <param name="comment">The comment</param>
         public async Task<PullRequestReviewComment> CreateReply(string owner, string name, int number, PullRequestReviewCommentReplyCreate comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             var endpoint = ApiUrls.PullRequestReviewComments(owner, name, number);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
@@ -296,7 +296,7 @@ public async Task<PullRequestReviewComment> CreateReply(string owner, string nam
         /// <param name="comment">The comment</param>
         public async Task<PullRequestReviewComment> CreateReply(long repositoryId, int number, PullRequestReviewCommentReplyCreate comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, number);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
@@ -319,9 +319,9 @@ public async Task<PullRequestReviewComment> CreateReply(long repositoryId, int n
         /// <param name="comment">The edited comment</param>
         public Task<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return ApiConnection.Patch<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(owner, name, number), comment);
         }
@@ -335,7 +335,7 @@ public Task<PullRequestReviewComment> Edit(string owner, string name, int number
         /// <param name="comment">The edited comment</param>
         public Task<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment)
         {
-            Ensure.ArgumentNotNull(comment, "comment");
+            Ensure.ArgumentNotNull(comment, nameof(comment));
 
             return ApiConnection.Patch<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(repositoryId, number), comment);
         }
@@ -349,8 +349,8 @@ public Task<PullRequestReviewComment> Edit(long repositoryId, int number, PullRe
         /// <param name="number">The pull request review comment number</param>
         public Task Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.PullRequestReviewComment(owner, name, number));
         }
diff --git a/Octokit/Clients/PullRequestReviewRequestsClient.cs b/Octokit/Clients/PullRequestReviewRequestsClient.cs
index 233b993b75..e7d0442ee4 100644
--- a/Octokit/Clients/PullRequestReviewRequestsClient.cs
+++ b/Octokit/Clients/PullRequestReviewRequestsClient.cs
@@ -26,8 +26,8 @@ public PullRequestReviewRequestsClient(IApiConnection apiConnection)
         /// <param name="number">The pull request number</param>
         public Task<IReadOnlyList<User>> GetAll(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<User>(ApiUrls.PullRequestReviewRequests(owner, name, number), null, AcceptHeaders.PullRequestReviewsApiPreview);
         }
@@ -42,9 +42,9 @@ public Task<IReadOnlyList<User>> GetAll(string owner, string name, int number)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<User>> GetAll(string owner, string name, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.PullRequestReviewRequests(owner, name, number), null, AcceptHeaders.PullRequestReviewsApiPreview, options);
         }
@@ -69,7 +69,7 @@ public Task<IReadOnlyList<User>> GetAll(long repositoryId, int number)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<User>> GetAll(long repositoryId, int number, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.PullRequestReviewRequests(repositoryId, number), null, AcceptHeaders.PullRequestReviewsApiPreview, options);
         }
@@ -84,9 +84,9 @@ public Task<IReadOnlyList<User>> GetAll(long repositoryId, int number, ApiOption
         /// <param name="users">List of logins of user will be requested for review</param>
         public async Task<PullRequest> Create(string owner, string name, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             var endpoint = ApiUrls.PullRequestReviewRequests(owner, name, number);
             var response = await ApiConnection.Connection.Post<PullRequest>(endpoint, users, AcceptHeaders.PullRequestReviewsApiPreview, null).ConfigureAwait(false);
@@ -108,7 +108,7 @@ public async Task<PullRequest> Create(string owner, string name, int number, Pul
         /// <param name="users">List of logins of user will be requested for review</param>
         public async Task<PullRequest> Create(long repositoryId, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             var endpoint = ApiUrls.PullRequestReviewRequests(repositoryId, number);
             var response = await ApiConnection.Connection.Post<PullRequest>(endpoint, users, AcceptHeaders.PullRequestReviewsApiPreview, null).ConfigureAwait(false);
@@ -131,9 +131,9 @@ public async Task<PullRequest> Create(long repositoryId, int number, PullRequest
         /// <param name="users">List of logins of users that will be not longer requested for review</param>
         public Task Delete(string owner, string name, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Delete(ApiUrls.PullRequestReviewRequests(owner, name, number), users, AcceptHeaders.PullRequestReviewsApiPreview);
         }
@@ -147,7 +147,7 @@ public Task Delete(string owner, string name, int number, PullRequestReviewReque
         /// <param name="users">List of logins of users that will be not longer requested for review</param>
         public Task Delete(long repositoryId, int number, PullRequestReviewRequest users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Delete(ApiUrls.PullRequestReviewRequests(repositoryId, number), users, AcceptHeaders.PullRequestReviewsApiPreview);
         }
diff --git a/Octokit/Clients/ReferencesClient.cs b/Octokit/Clients/ReferencesClient.cs
index b26df045f5..403fa58194 100644
--- a/Octokit/Clients/ReferencesClient.cs
+++ b/Octokit/Clients/ReferencesClient.cs
@@ -32,9 +32,9 @@ public ReferencesClient(IApiConnection apiConnection) :
         /// <returns></returns>
         public Task<Reference> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Reference>(ApiUrls.Reference(owner, name, reference));
         }
@@ -50,7 +50,7 @@ public Task<Reference> Get(string owner, string name, string reference)
         /// <returns></returns>
         public Task<Reference> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<Reference>(ApiUrls.Reference(repositoryId, reference));
         }
@@ -81,9 +81,9 @@ public Task<IReadOnlyList<Reference>> GetAll(string owner, string name)
         /// <returns></returns>
         public Task<IReadOnlyList<Reference>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Reference>(ApiUrls.Reference(owner, name), options);
         }
@@ -112,7 +112,7 @@ public Task<IReadOnlyList<Reference>> GetAll(long repositoryId)
         /// <returns></returns>
         public Task<IReadOnlyList<Reference>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Reference>(ApiUrls.Reference(repositoryId), options);
         }
@@ -145,10 +145,10 @@ public Task<IReadOnlyList<Reference>> GetAllForSubNamespace(string owner, string
         /// <returns></returns>
         public Task<IReadOnlyList<Reference>> GetAllForSubNamespace(string owner, string name, string subNamespace, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(subNamespace, "subNamespace");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(subNamespace, nameof(subNamespace));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             // TODO: Handle 404 when subNamespace cannot be found
 
@@ -181,8 +181,8 @@ public Task<IReadOnlyList<Reference>> GetAllForSubNamespace(long repositoryId, s
         /// <returns></returns>
         public Task<IReadOnlyList<Reference>> GetAllForSubNamespace(long repositoryId, string subNamespace, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(subNamespace, "subNamespace");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(subNamespace, nameof(subNamespace));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             // TODO: Handle 404 when subNamespace cannot be found
 
@@ -201,9 +201,9 @@ public Task<IReadOnlyList<Reference>> GetAllForSubNamespace(long repositoryId, s
         /// <returns></returns>
         public Task<Reference> Create(string owner, string name, NewReference reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return ApiConnection.Post<Reference>(ApiUrls.Reference(owner, name), reference);
         }
@@ -219,7 +219,7 @@ public Task<Reference> Create(string owner, string name, NewReference reference)
         /// <returns></returns>
         public Task<Reference> Create(long repositoryId, NewReference reference)
         {
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return ApiConnection.Post<Reference>(ApiUrls.Reference(repositoryId), reference);
         }
@@ -237,10 +237,10 @@ public Task<Reference> Create(long repositoryId, NewReference reference)
         /// <returns></returns>
         public Task<Reference> Update(string owner, string name, string reference, ReferenceUpdate referenceUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(referenceUpdate, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(referenceUpdate, nameof(referenceUpdate));
 
             return ApiConnection.Patch<Reference>(ApiUrls.Reference(owner, name, reference), referenceUpdate);
         }
@@ -257,8 +257,8 @@ public Task<Reference> Update(string owner, string name, string reference, Refer
         /// <returns></returns>
         public Task<Reference> Update(long repositoryId, string reference, ReferenceUpdate referenceUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNull(referenceUpdate, "update");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNull(referenceUpdate, nameof(referenceUpdate));
 
             return ApiConnection.Patch<Reference>(ApiUrls.Reference(repositoryId, reference), referenceUpdate);
         }
@@ -275,9 +275,9 @@ public Task<Reference> Update(long repositoryId, string reference, ReferenceUpda
         /// <returns></returns>
         public Task Delete(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Delete(ApiUrls.Reference(owner, name, reference));
         }
@@ -293,7 +293,7 @@ public Task Delete(string owner, string name, string reference)
         /// <returns></returns>
         public Task Delete(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Delete(ApiUrls.Reference(repositoryId, reference));
         }
diff --git a/Octokit/Clients/ReleasesClient.cs b/Octokit/Clients/ReleasesClient.cs
index 5fe9f71385..804df0222e 100644
--- a/Octokit/Clients/ReleasesClient.cs
+++ b/Octokit/Clients/ReleasesClient.cs
@@ -30,8 +30,8 @@ public ReleasesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<Release>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -61,9 +61,9 @@ public Task<IReadOnlyList<Release>> GetAll(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<Release>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.Releases(owner, name);
             return ApiConnection.GetAll<Release>(endpoint, null, AcceptHeaders.StableVersion, options);
@@ -80,7 +80,7 @@ public Task<IReadOnlyList<Release>> GetAll(string owner, string name, ApiOptions
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<Release>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.Releases(repositoryId);
             return ApiConnection.GetAll<Release>(endpoint, null, AcceptHeaders.StableVersion, options);
@@ -98,8 +98,8 @@ public Task<IReadOnlyList<Release>> GetAll(long repositoryId, ApiOptions options
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> Get(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.Releases(owner, name, id);
             return ApiConnection.Get<Release>(endpoint);
@@ -131,8 +131,8 @@ public Task<Release> Get(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> GetLatest(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.LatestRelease(owner, name);
             return ApiConnection.Get<Release>(endpoint);
@@ -164,9 +164,9 @@ public Task<Release> GetLatest(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> Create(string owner, string name, NewRelease data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Releases(owner, name);
             return ApiConnection.Post<Release>(endpoint, data, AcceptHeaders.StableVersion);
@@ -183,7 +183,7 @@ public Task<Release> Create(string owner, string name, NewRelease data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> Create(long repositoryId, NewRelease data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Releases(repositoryId);
             return ApiConnection.Post<Release>(endpoint, data, AcceptHeaders.StableVersion);
@@ -202,9 +202,9 @@ public Task<Release> Create(long repositoryId, NewRelease data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> Edit(string owner, string name, int id, ReleaseUpdate data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Releases(owner, name, id);
             return ApiConnection.Patch<Release>(endpoint, data);
@@ -222,7 +222,7 @@ public Task<Release> Edit(string owner, string name, int id, ReleaseUpdate data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<Release> Edit(long repositoryId, int id, ReleaseUpdate data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Releases(repositoryId, id);
             return ApiConnection.Patch<Release>(endpoint, data);
@@ -240,8 +240,8 @@ public Task<Release> Edit(long repositoryId, int id, ReleaseUpdate data)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Delete(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.Releases(owner, name, id);
             return ApiConnection.Delete(endpoint);
@@ -274,8 +274,8 @@ public Task Delete(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllAssets(owner, name, id, ApiOptions.None);
         }
@@ -307,9 +307,9 @@ public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int id)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.ReleaseAssets(owner, name, id);
             return ApiConnection.GetAll<ReleaseAsset>(endpoint, null, AcceptHeaders.StableVersion, options);
@@ -327,7 +327,7 @@ public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.ReleaseAssets(repositoryId, id);
             return ApiConnection.GetAll<ReleaseAsset>(endpoint, null, AcceptHeaders.StableVersion, options);
@@ -344,8 +344,8 @@ public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int id,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<ReleaseAsset> UploadAsset(Release release, ReleaseAssetUpload data)
         {
-            Ensure.ArgumentNotNull(release, "release");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(release, nameof(release));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = release.UploadUrl.ExpandUriTemplate(new { name = data.FileName });
 
@@ -377,8 +377,8 @@ public Task<ReleaseAsset> UploadAsset(Release release, ReleaseAssetUpload data)
         /// <param name="assetId">The id of the <see cref="ReleaseAsset"/></param>
         public Task<ReleaseAsset> GetAsset(string owner, string name, int assetId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.Asset(owner, name, assetId);
             return ApiConnection.Get<ReleaseAsset>(endpoint);
@@ -410,9 +410,9 @@ public Task<ReleaseAsset> GetAsset(long repositoryId, int assetId)
         /// <param name="data">Description of the asset with its amended data</param>
         public Task<ReleaseAsset> EditAsset(string owner, string name, int assetId, ReleaseAssetUpdate data)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Asset(owner, name, assetId);
             return ApiConnection.Patch<ReleaseAsset>(endpoint, data);
@@ -429,7 +429,7 @@ public Task<ReleaseAsset> EditAsset(string owner, string name, int assetId, Rele
         /// <param name="data">Description of the asset with its amended data</param>
         public Task<ReleaseAsset> EditAsset(long repositoryId, int assetId, ReleaseAssetUpdate data)
         {
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var endpoint = ApiUrls.Asset(repositoryId, assetId);
             return ApiConnection.Patch<ReleaseAsset>(endpoint, data);
@@ -446,8 +446,8 @@ public Task<ReleaseAsset> EditAsset(long repositoryId, int assetId, ReleaseAsset
         /// <param name="id">The id of the <see cref="ReleaseAsset"/>.</param>
         public Task DeleteAsset(string owner, string name, int id)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.Asset(owner, name, id);
             return ApiConnection.Delete(endpoint);
diff --git a/Octokit/Clients/RepoCollaboratorsClient.cs b/Octokit/Clients/RepoCollaboratorsClient.cs
index a355e51471..fd3afe2a9a 100644
--- a/Octokit/Clients/RepoCollaboratorsClient.cs
+++ b/Octokit/Clients/RepoCollaboratorsClient.cs
@@ -31,8 +31,8 @@ public RepoCollaboratorsClient(IApiConnection apiConnection)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<User>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -62,9 +62,9 @@ public Task<IReadOnlyList<User>> GetAll(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<User>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.RepoCollaborators(owner, name), options);
         }
@@ -80,7 +80,7 @@ public Task<IReadOnlyList<User>> GetAll(string owner, string name, ApiOptions op
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<User>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.RepoCollaborators(repositoryId), options);
         }
@@ -97,9 +97,9 @@ public Task<IReadOnlyList<User>> GetAll(long repositoryId, ApiOptions options)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public async Task<bool> IsCollaborator(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -123,7 +123,7 @@ public async Task<bool> IsCollaborator(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public async Task<bool> IsCollaborator(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -148,9 +148,9 @@ public async Task<bool> IsCollaborator(long repositoryId, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<CollaboratorPermission> ReviewPermission(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection
                 .Get<CollaboratorPermission>(ApiUrls.RepoCollaboratorPermission(owner, name, user), null, AcceptHeaders.OrganizationMembershipPreview);
@@ -167,7 +167,7 @@ public Task<CollaboratorPermission> ReviewPermission(string owner, string name,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<CollaboratorPermission> ReviewPermission(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection
                 .Get<CollaboratorPermission>(ApiUrls.RepoCollaboratorPermission(repositoryId, user), null, AcceptHeaders.OrganizationMembershipPreview);
@@ -185,9 +185,9 @@ public Task<CollaboratorPermission> ReviewPermission(long repositoryId, string u
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Add(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Put(ApiUrls.RepoCollaborator(owner, name, user));
         }
@@ -205,9 +205,9 @@ public Task Add(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public async Task<bool> Add(string owner, string name, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -231,7 +231,7 @@ public async Task<bool> Add(string owner, string name, string user, Collaborator
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Add(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Put(ApiUrls.RepoCollaborator(repositoryId, user));
         }
@@ -248,7 +248,7 @@ public Task Add(long repositoryId, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public async Task<bool> Add(long repositoryId, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             try
             {
@@ -273,9 +273,9 @@ public async Task<bool> Add(long repositoryId, string user, CollaboratorRequest
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<RepositoryInvitation> Invite(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Put<RepositoryInvitation>(ApiUrls.RepoCollaborator(owner, name, user), new object(), null, AcceptHeaders.InvitationsApiPreview);
         }
@@ -293,10 +293,10 @@ public Task<RepositoryInvitation> Invite(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<RepositoryInvitation> Invite(string owner, string name, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "permission");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return ApiConnection.Put<RepositoryInvitation>(ApiUrls.RepoCollaborator(owner, name, user), permission, null, AcceptHeaders.InvitationsApiPreview);
         }
@@ -312,7 +312,7 @@ public Task<RepositoryInvitation> Invite(string owner, string name, string user,
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<RepositoryInvitation> Invite(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Put<RepositoryInvitation>(ApiUrls.RepoCollaborator(repositoryId, user), new object(), null, AcceptHeaders.InvitationsApiPreview);
         }
@@ -329,8 +329,8 @@ public Task<RepositoryInvitation> Invite(long repositoryId, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>        
         public Task<RepositoryInvitation> Invite(long repositoryId, string user, CollaboratorRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(permission, "permission");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(permission, nameof(permission));
 
             return ApiConnection.Put<RepositoryInvitation>(ApiUrls.RepoCollaborator(repositoryId, user), permission, null, AcceptHeaders.InvitationsApiPreview);
         }
@@ -347,9 +347,9 @@ public Task<RepositoryInvitation> Invite(long repositoryId, string user, Collabo
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Delete(string owner, string name, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Delete(ApiUrls.RepoCollaborator(owner, name, user));
         }
@@ -365,7 +365,7 @@ public Task Delete(string owner, string name, string user)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Delete(long repositoryId, string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return ApiConnection.Delete(ApiUrls.RepoCollaborator(repositoryId, user));
         }
diff --git a/Octokit/Clients/RepositoriesClient.cs b/Octokit/Clients/RepositoriesClient.cs
index eef0949529..0fb6ed1f97 100644
--- a/Octokit/Clients/RepositoriesClient.cs
+++ b/Octokit/Clients/RepositoriesClient.cs
@@ -52,7 +52,7 @@ public RepositoriesClient(IApiConnection apiConnection) : base(apiConnection)
         /// <returns>A <see cref="Repository"/> instance for the created repository.</returns>
         public Task<Repository> Create(NewRepository newRepository)
         {
-            Ensure.ArgumentNotNull(newRepository, "newRepository");
+            Ensure.ArgumentNotNull(newRepository, nameof(newRepository));
 
             return Create(ApiUrls.Repositories(), null, newRepository);
         }
@@ -69,8 +69,8 @@ public Task<Repository> Create(NewRepository newRepository)
         /// <returns>A <see cref="Repository"/> instance for the created repository</returns>
         public Task<Repository> Create(string organizationLogin, NewRepository newRepository)
         {
-            Ensure.ArgumentNotNull(organizationLogin, "organizationLogin");
-            Ensure.ArgumentNotNull(newRepository, "newRepository");
+            Ensure.ArgumentNotNull(organizationLogin, nameof(organizationLogin));
+            Ensure.ArgumentNotNull(newRepository, nameof(newRepository));
             if (string.IsNullOrEmpty(newRepository.Name))
                 throw new ArgumentException("The new repository's name must not be null.");
 
@@ -143,8 +143,8 @@ async Task<Repository> Create(Uri url, string organizationLogin, NewRepository n
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task Delete(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.Repository(owner, name));
         }
@@ -172,10 +172,10 @@ public Task Delete(long repositoryId)
         /// <returns>The updated <see cref="T:Octokit.Repository"/></returns>
         public Task<Repository> Edit(string owner, string name, RepositoryUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(update, "update");
-            Ensure.ArgumentNotNull(update.Name, "update.Name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(update, nameof(update));
+            Ensure.ArgumentNotNull(update.Name, nameof(update.Name));
 
             return ApiConnection.Patch<Repository>(ApiUrls.Repository(owner, name), update, AcceptHeaders.Concat(AcceptHeaders.SquashCommitPreview, AcceptHeaders.LicensesApiPreview));
         }
@@ -188,7 +188,7 @@ public Task<Repository> Edit(string owner, string name, RepositoryUpdate update)
         /// <returns>The updated <see cref="T:Octokit.Repository"/></returns>
         public Task<Repository> Edit(long repositoryId, RepositoryUpdate update)
         {
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Patch<Repository>(ApiUrls.Repository(repositoryId), update, AcceptHeaders.Concat(AcceptHeaders.SquashCommitPreview, AcceptHeaders.LicensesApiPreview));
         }
@@ -205,8 +205,8 @@ public Task<Repository> Edit(long repositoryId, RepositoryUpdate update)
         /// <returns>A <see cref="Repository"/></returns>
         public Task<Repository> Get(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<Repository>(ApiUrls.Repository(owner, name), null, AcceptHeaders.Concat(AcceptHeaders.SquashCommitPreview, AcceptHeaders.LicensesApiPreview));
         }
@@ -253,7 +253,7 @@ public Task<IReadOnlyList<Repository>> GetAllPublic()
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllPublic(PublicRepositoryRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var url = ApiUrls.AllPublicRepositories(request.Since);
 
@@ -287,7 +287,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent()
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Repositories(), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -305,15 +305,15 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent(ApiOptions options)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(RepositoryRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
 
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(RepositoryRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Repositories(), request.ToParametersDictionary(), AcceptHeaders.LicensesApiPreview, options);
         }
@@ -330,7 +330,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent(RepositoryRequest reques
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return GetAllForUser(login, ApiOptions.None);
         }
@@ -347,8 +347,8 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string login)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string login, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Repositories(login), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -364,7 +364,7 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string login, ApiOptions op
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForOrg(string organization)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
 
             return GetAllForOrg(organization, ApiOptions.None);
         }
@@ -381,8 +381,8 @@ public Task<IReadOnlyList<Repository>> GetAllForOrg(string organization)
         /// <returns>A <see cref="IReadOnlyPagedCollection{Repository}"/> of <see cref="Repository"/>.</returns>
         public Task<IReadOnlyList<Repository>> GetAllForOrg(string organization, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.OrganizationRepositories(organization), null, AcceptHeaders.LicensesApiPreview, options);
         }
@@ -509,8 +509,8 @@ public Task<IReadOnlyList<Repository>> GetAllForOrg(string organization, ApiOpti
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllContributors(owner, name, false);
         }
@@ -540,9 +540,9 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long reposi
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllContributors(owner, name, false, options);
         }
@@ -558,7 +558,7 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owne
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return GetAllContributors(repositoryId, false, options);
         }
@@ -575,8 +575,8 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long reposi
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owner, string name, bool includeAnonymous)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllContributors(owner, name, includeAnonymous, ApiOptions.None);
         }
@@ -608,9 +608,9 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long reposi
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owner, string name, bool includeAnonymous, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var parameters = new Dictionary<string, string>();
             if (includeAnonymous)
@@ -631,7 +631,7 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(string owne
         /// <returns>All contributors of the repository.</returns>
         public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long repositoryId, bool includeAnonymous, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var parameters = new Dictionary<string, string>();
             if (includeAnonymous)
@@ -651,8 +651,8 @@ public Task<IReadOnlyList<RepositoryContributor>> GetAllContributors(long reposi
         /// <returns>All languages used in the repository and the number of bytes of each language.</returns>
         public async Task<IReadOnlyList<RepositoryLanguage>> GetAllLanguages(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.RepositoryLanguages(owner, name);
             var data = await ApiConnection.Get<Dictionary<string, long>>(endpoint).ConfigureAwait(false);
@@ -689,8 +689,8 @@ public async Task<IReadOnlyList<RepositoryLanguage>> GetAllLanguages(long reposi
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public Task<IReadOnlyList<Team>> GetAllTeams(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllTeams(owner, name, ApiOptions.None);
         }
@@ -720,9 +720,9 @@ public Task<IReadOnlyList<Team>> GetAllTeams(long repositoryId)
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public Task<IReadOnlyList<Team>> GetAllTeams(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Team>(ApiUrls.RepositoryTeams(owner, name), options);
         }
@@ -738,7 +738,7 @@ public Task<IReadOnlyList<Team>> GetAllTeams(string owner, string name, ApiOptio
         /// <returns>All <see cref="T:Octokit.Team"/>s associated with the repository</returns>
         public Task<IReadOnlyList<Team>> GetAllTeams(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Team>(ApiUrls.RepositoryTeams(repositoryId), options);
         }
@@ -754,8 +754,8 @@ public Task<IReadOnlyList<Team>> GetAllTeams(long repositoryId, ApiOptions optio
         /// <returns>All of the repositories tags.</returns>
         public Task<IReadOnlyList<RepositoryTag>> GetAllTags(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllTags(owner, name, ApiOptions.None);
         }
@@ -785,9 +785,9 @@ public Task<IReadOnlyList<RepositoryTag>> GetAllTags(long repositoryId)
         /// <returns>All of the repositories tags.</returns>
         public Task<IReadOnlyList<RepositoryTag>> GetAllTags(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryTag>(ApiUrls.RepositoryTags(owner, name), options);
         }
@@ -803,7 +803,7 @@ public Task<IReadOnlyList<RepositoryTag>> GetAllTags(string owner, string name,
         /// <returns>All of the repositories tags.</returns>
         public Task<IReadOnlyList<RepositoryTag>> GetAllTags(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryTag>(ApiUrls.RepositoryTags(repositoryId), options);
         }
diff --git a/Octokit/Clients/RepositoryBranchesClient.cs b/Octokit/Clients/RepositoryBranchesClient.cs
index 8ad2d0fd88..e633916569 100644
--- a/Octokit/Clients/RepositoryBranchesClient.cs
+++ b/Octokit/Clients/RepositoryBranchesClient.cs
@@ -32,8 +32,8 @@ public RepositoryBranchesClient(IApiConnection apiConnection)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Branch>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -62,9 +62,9 @@ public Task<IReadOnlyList<Branch>> GetAll(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<Branch>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Branch>(ApiUrls.RepoBranches(owner, name), null, AcceptHeaders.ProtectedBranchesApiPreview, options);
         }
@@ -79,7 +79,7 @@ public Task<IReadOnlyList<Branch>> GetAll(string owner, string name, ApiOptions
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Branch>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Branch>(ApiUrls.RepoBranches(repositoryId), null, AcceptHeaders.ProtectedBranchesApiPreview, options);
         }
@@ -95,9 +95,9 @@ public Task<IReadOnlyList<Branch>> GetAll(long repositoryId, ApiOptions options)
         /// <param name="branch">The name of the branch</param>
         public Task<Branch> Get(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<Branch>(ApiUrls.RepoBranch(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -112,7 +112,7 @@ public Task<Branch> Get(string owner, string name, string branch)
         /// <param name="branch">The name of the branch</param>
         public Task<Branch> Get(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branchName");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<Branch>(ApiUrls.RepoBranch(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -128,9 +128,9 @@ public Task<Branch> Get(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionSettings> GetBranchProtection(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -145,7 +145,7 @@ public Task<BranchProtectionSettings> GetBranchProtection(string owner, string n
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionSettings> GetBranchProtection(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -162,10 +162,10 @@ public Task<BranchProtectionSettings> GetBranchProtection(long repositoryId, str
         /// <param name="update">Branch protection settings</param>
         public Task<BranchProtectionSettings> UpdateBranchProtection(string owner, string name, string branch, BranchProtectionSettingsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(owner, name, branch), update, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -181,8 +181,8 @@ public Task<BranchProtectionSettings> UpdateBranchProtection(string owner, strin
         /// <param name="update">Branch protection settings</param>
         public Task<BranchProtectionSettings> UpdateBranchProtection(long repositoryId, string branch, BranchProtectionSettingsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Put<BranchProtectionSettings>(ApiUrls.RepoBranchProtection(repositoryId, branch), update, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -198,9 +198,9 @@ public Task<BranchProtectionSettings> UpdateBranchProtection(long repositoryId,
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteBranchProtection(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoBranchProtection(owner, name, branch);
             try
@@ -224,7 +224,7 @@ public async Task<bool> DeleteBranchProtection(string owner, string name, string
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteBranchProtection(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoBranchProtection(repositoryId, branch);
             try
@@ -249,9 +249,9 @@ public async Task<bool> DeleteBranchProtection(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionRequiredStatusChecks>(ApiUrls.RepoRequiredStatusChecks(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -266,7 +266,7 @@ public Task<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(string
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionRequiredStatusChecks>(ApiUrls.RepoRequiredStatusChecks(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -283,10 +283,10 @@ public Task<BranchProtectionRequiredStatusChecks> GetRequiredStatusChecks(long r
         /// <param name="update">Required status checks</param>
         public Task<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(string owner, string name, string branch, BranchProtectionRequiredStatusChecksUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Patch<BranchProtectionRequiredStatusChecks>(ApiUrls.RepoRequiredStatusChecks(owner, name, branch), update, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -302,8 +302,8 @@ public Task<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(str
         /// <param name="update">Required status checks</param>
         public Task<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(long repositoryId, string branch, BranchProtectionRequiredStatusChecksUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(update, "update");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Patch<BranchProtectionRequiredStatusChecks>(ApiUrls.RepoRequiredStatusChecks(repositoryId, branch), update, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -319,9 +319,9 @@ public Task<BranchProtectionRequiredStatusChecks> UpdateRequiredStatusChecks(lon
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteRequiredStatusChecks(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoRequiredStatusChecks(owner, name, branch);
 
@@ -346,7 +346,7 @@ public async Task<bool> DeleteRequiredStatusChecks(string owner, string name, st
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteRequiredStatusChecks(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoRequiredStatusChecks(repositoryId, branch);
 
@@ -401,9 +401,9 @@ public Task<IReadOnlyList<string>> GetRequiredStatusChecksContexts(long reposito
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<string>> GetAllRequiredStatusChecksContexts(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -418,7 +418,7 @@ public Task<IReadOnlyList<string>> GetAllRequiredStatusChecksContexts(string own
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<string>> GetAllRequiredStatusChecksContexts(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -435,10 +435,10 @@ public Task<IReadOnlyList<string>> GetAllRequiredStatusChecksContexts(long repos
         /// <param name="contexts">The contexts to replace</param>
         public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), contexts, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -454,8 +454,8 @@ public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(string own
         /// <param name="contexts">The contexts to replace</param>
         public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Put<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), contexts, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -472,10 +472,10 @@ public Task<IReadOnlyList<string>> UpdateRequiredStatusChecksContexts(long repos
         /// <param name="contexts">The contexts to add</param>
         public Task<IReadOnlyList<string>> AddRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Post<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), contexts, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -491,8 +491,8 @@ public Task<IReadOnlyList<string>> AddRequiredStatusChecksContexts(string owner,
         /// <param name="contexts">The contexts to add</param>
         public Task<IReadOnlyList<string>> AddRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Post<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), contexts, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -509,10 +509,10 @@ public Task<IReadOnlyList<string>> AddRequiredStatusChecksContexts(long reposito
         /// <param name="contexts">The contexts to remove</param>
         public Task<IReadOnlyList<string>> DeleteRequiredStatusChecksContexts(string owner, string name, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Delete<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(owner, name, branch), contexts, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -528,8 +528,8 @@ public Task<IReadOnlyList<string>> DeleteRequiredStatusChecksContexts(string own
         /// <param name="contexts">The contexts to remove</param>
         public Task<IReadOnlyList<string>> DeleteRequiredStatusChecksContexts(long repositoryId, string branch, IReadOnlyList<string> contexts)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(contexts, "contexts");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(contexts, nameof(contexts));
 
             return ApiConnection.Delete<IReadOnlyList<string>>(ApiUrls.RepoRequiredStatusChecksContexts(repositoryId, branch), contexts, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -545,9 +545,9 @@ public Task<IReadOnlyList<string>> DeleteRequiredStatusChecksContexts(long repos
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionRequiredReviews> GetReviewEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionRequiredReviews>(ApiUrls.RepoProtectedBranchReviewEnforcement(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -562,7 +562,7 @@ public Task<BranchProtectionRequiredReviews> GetReviewEnforcement(string owner,
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionRequiredReviews> GetReviewEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionRequiredReviews>(ApiUrls.RepoProtectedBranchReviewEnforcement(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -579,9 +579,9 @@ public Task<BranchProtectionRequiredReviews> GetReviewEnforcement(long repositor
         /// <param name="update">The required pull request review settings</param>
         public Task<BranchProtectionRequiredReviews> UpdateReviewEnforcement(string owner, string name, string branch, BranchProtectionRequiredReviewsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Patch<BranchProtectionRequiredReviews>(ApiUrls.RepoProtectedBranchReviewEnforcement(owner, name, branch), update, AcceptHeaders.ProtectedBranchesApiPreview);
@@ -598,7 +598,7 @@ public Task<BranchProtectionRequiredReviews> UpdateReviewEnforcement(string owne
         /// <param name="update">The required pull request review settings</param>
         public Task<BranchProtectionRequiredReviews> UpdateReviewEnforcement(long repositoryId, string branch, BranchProtectionRequiredReviewsUpdate update)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
             Ensure.ArgumentNotNull(update, nameof(update));
 
             return ApiConnection.Patch<BranchProtectionRequiredReviews>(ApiUrls.RepoProtectedBranchReviewEnforcement(repositoryId, branch), update, AcceptHeaders.ProtectedBranchesApiPreview);
@@ -615,9 +615,9 @@ public Task<BranchProtectionRequiredReviews> UpdateReviewEnforcement(long reposi
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> RemoveReviewEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoProtectedBranchReviewEnforcement(owner, name, branch);
 
@@ -642,7 +642,7 @@ public async Task<bool> RemoveReviewEnforcement(string owner, string name, strin
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> RemoveReviewEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoProtectedBranchReviewEnforcement(repositoryId, branch);
 
@@ -668,9 +668,9 @@ public async Task<bool> RemoveReviewEnforcement(long repositoryId, string branch
         /// <param name="branch">The name of the branch</param>
         public Task<EnforceAdmins> GetAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<EnforceAdmins>(ApiUrls.RepoProtectedBranchAdminEnforcement(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -685,7 +685,7 @@ public Task<EnforceAdmins> GetAdminEnforcement(string owner, string name, string
         /// <param name="branch">The name of the branch</param>
         public Task<EnforceAdmins> GetAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<EnforceAdmins>(ApiUrls.RepoProtectedBranchAdminEnforcement(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -701,9 +701,9 @@ public Task<EnforceAdmins> GetAdminEnforcement(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public Task<EnforceAdmins> AddAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Post<EnforceAdmins>(ApiUrls.RepoProtectedBranchAdminEnforcement(owner, name, branch), new object(), AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -718,7 +718,7 @@ public Task<EnforceAdmins> AddAdminEnforcement(string owner, string name, string
         /// <param name="branch">The name of the branch</param>
         public Task<EnforceAdmins> AddAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Post<EnforceAdmins>(ApiUrls.RepoProtectedBranchAdminEnforcement(repositoryId, branch), new object(), AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -734,9 +734,9 @@ public Task<EnforceAdmins> AddAdminEnforcement(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> RemoveAdminEnforcement(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoProtectedBranchAdminEnforcement(owner, name, branch);
 
@@ -761,7 +761,7 @@ public async Task<bool> RemoveAdminEnforcement(string owner, string name, string
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> RemoveAdminEnforcement(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoProtectedBranchAdminEnforcement(repositoryId, branch);
 
@@ -787,9 +787,9 @@ public async Task<bool> RemoveAdminEnforcement(long repositoryId, string branch)
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionPushRestrictions>(ApiUrls.RepoRestrictions(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -804,7 +804,7 @@ public Task<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(str
         /// <param name="branch">The name of the branch</param>
         public Task<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<BranchProtectionPushRestrictions>(ApiUrls.RepoRestrictions(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -820,9 +820,9 @@ public Task<BranchProtectionPushRestrictions> GetProtectedBranchRestrictions(lon
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteProtectedBranchRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoRestrictions(owner, name, branch);
 
@@ -847,7 +847,7 @@ public async Task<bool> DeleteProtectedBranchRestrictions(string owner, string n
         /// <param name="branch">The name of the branch</param>
         public async Task<bool> DeleteProtectedBranchRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             var endpoint = ApiUrls.RepoRestrictions(repositoryId, branch);
 
@@ -902,9 +902,9 @@ public Task<IReadOnlyList<Team>> GetProtectedBranchTeamRestrictions(long reposit
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<Team>> GetAllProtectedBranchTeamRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -919,7 +919,7 @@ public Task<IReadOnlyList<Team>> GetAllProtectedBranchTeamRestrictions(string ow
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<Team>> GetAllProtectedBranchTeamRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -936,10 +936,10 @@ public Task<IReadOnlyList<Team>> GetAllProtectedBranchTeamRestrictions(long repo
         /// <param name="teams">List of teams with push access</param>
         public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), teams, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -955,8 +955,8 @@ public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(string ow
         /// <param name="teams">List of teams with push access</param>
         public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Put<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), teams, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -973,10 +973,10 @@ public Task<IReadOnlyList<Team>> UpdateProtectedBranchTeamRestrictions(long repo
         /// <param name="teams">List of teams with push access to add</param>
         public Task<IReadOnlyList<Team>> AddProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Post<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), teams, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -992,8 +992,8 @@ public Task<IReadOnlyList<Team>> AddProtectedBranchTeamRestrictions(string owner
         /// <param name="teams">List of teams with push access to add</param>
         public Task<IReadOnlyList<Team>> AddProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Post<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), teams, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1010,10 +1010,10 @@ public Task<IReadOnlyList<Team>> AddProtectedBranchTeamRestrictions(long reposit
         /// <param name="teams">List of teams to remove</param>
         public Task<IReadOnlyList<Team>> DeleteProtectedBranchTeamRestrictions(string owner, string name, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Delete<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(owner, name, branch), teams, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1029,8 +1029,8 @@ public Task<IReadOnlyList<Team>> DeleteProtectedBranchTeamRestrictions(string ow
         /// <param name="teams">List of teams to remove</param>
         public Task<IReadOnlyList<Team>> DeleteProtectedBranchTeamRestrictions(long repositoryId, string branch, BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             return ApiConnection.Delete<IReadOnlyList<Team>>(ApiUrls.RepoRestrictionsTeams(repositoryId, branch), teams, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1075,9 +1075,9 @@ public Task<IReadOnlyList<User>> GetProtectedBranchUserRestrictions(long reposit
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<User>> GetAllProtectedBranchUserRestrictions(string owner, string name, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1092,7 +1092,7 @@ public Task<IReadOnlyList<User>> GetAllProtectedBranchUserRestrictions(string ow
         /// <param name="branch">The name of the branch</param>
         public Task<IReadOnlyList<User>> GetAllProtectedBranchUserRestrictions(long repositoryId, string branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             return ApiConnection.Get<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1109,10 +1109,10 @@ public Task<IReadOnlyList<User>> GetAllProtectedBranchUserRestrictions(long repo
         /// <param name="users">List of users with push access</param>
         public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), users, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1128,8 +1128,8 @@ public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(string ow
         /// <param name="users">List of users with push access</param>
         public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Put<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), users, null, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1146,10 +1146,10 @@ public Task<IReadOnlyList<User>> UpdateProtectedBranchUserRestrictions(long repo
         /// <param name="users">List of users with push access to add</param>
         public Task<IReadOnlyList<User>> AddProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Post<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), users, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1165,8 +1165,8 @@ public Task<IReadOnlyList<User>> AddProtectedBranchUserRestrictions(string owner
         /// <param name="users">List of users with push access to add</param>
         public Task<IReadOnlyList<User>> AddProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Post<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), users, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1183,10 +1183,10 @@ public Task<IReadOnlyList<User>> AddProtectedBranchUserRestrictions(long reposit
         /// <param name="users">List of users with push access to remove</param>
         public Task<IReadOnlyList<User>> DeleteProtectedBranchUserRestrictions(string owner, string name, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Delete<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(owner, name, branch), users, AcceptHeaders.ProtectedBranchesApiPreview);
         }
@@ -1202,8 +1202,8 @@ public Task<IReadOnlyList<User>> DeleteProtectedBranchUserRestrictions(string ow
         /// <param name="users">List of users with push access to remove</param>
         public Task<IReadOnlyList<User>> DeleteProtectedBranchUserRestrictions(long repositoryId, string branch, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             return ApiConnection.Delete<IReadOnlyList<User>>(ApiUrls.RepoRestrictionsUsers(repositoryId, branch), users, AcceptHeaders.ProtectedBranchesApiPreview);
         }
diff --git a/Octokit/Clients/RepositoryCommentsClient.cs b/Octokit/Clients/RepositoryCommentsClient.cs
index 225a616c7f..03b2bb9627 100644
--- a/Octokit/Clients/RepositoryCommentsClient.cs
+++ b/Octokit/Clients/RepositoryCommentsClient.cs
@@ -29,8 +29,8 @@ public RepositoryCommentsClient(IApiConnection apiConnection)
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         public Task<CommitComment> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<CommitComment>(ApiUrls.CommitComment(owner, name, number), null, AcceptHeaders.ReactionsPreview);
         }
@@ -54,8 +54,8 @@ public Task<CommitComment> Get(long repositoryId, int number)
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForRepository(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllForRepository(owner, name, ApiOptions.None);
         }
@@ -79,9 +79,9 @@ public Task<IReadOnlyList<CommitComment>> GetAllForRepository(long repositoryId)
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForRepository(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitComment>(ApiUrls.CommitComments(owner, name), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -94,7 +94,7 @@ public Task<IReadOnlyList<CommitComment>> GetAllForRepository(string owner, stri
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-commit-comments-for-a-repository</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitComment>(ApiUrls.CommitComments(repositoryId), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -108,9 +108,9 @@ public Task<IReadOnlyList<CommitComment>> GetAllForRepository(long repositoryId,
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForCommit(string owner, string name, string sha)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             return GetAllForCommit(owner, name, sha, ApiOptions.None);
         }
@@ -123,7 +123,7 @@ public Task<IReadOnlyList<CommitComment>> GetAllForCommit(string owner, string n
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForCommit(long repositoryId, string sha)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             return GetAllForCommit(repositoryId, sha, ApiOptions.None);
         }
@@ -138,10 +138,10 @@ public Task<IReadOnlyList<CommitComment>> GetAllForCommit(long repositoryId, str
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForCommit(string owner, string name, string sha, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitComment>(ApiUrls.CommitComments(owner, name, sha), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -155,8 +155,8 @@ public Task<IReadOnlyList<CommitComment>> GetAllForCommit(string owner, string n
         /// <remarks>http://developer.github.com/v3/repos/comments/#list-comments-for-a-single-commit</remarks>
         public Task<IReadOnlyList<CommitComment>> GetAllForCommit(long repositoryId, string sha, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<CommitComment>(ApiUrls.CommitComments(repositoryId, sha), null, AcceptHeaders.ReactionsPreview, options);
         }
@@ -171,10 +171,10 @@ public Task<IReadOnlyList<CommitComment>> GetAllForCommit(long repositoryId, str
         /// <remarks>http://developer.github.com/v3/repos/comments/#create-a-commit-comment</remarks>
         public Task<CommitComment> Create(string owner, string name, string sha, NewCommitComment newCommitComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(newCommitComment, "newCommitComment");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(newCommitComment, nameof(newCommitComment));
 
             return ApiConnection.Post<CommitComment>(ApiUrls.CommitComments(owner, name, sha), newCommitComment);
         }
@@ -188,8 +188,8 @@ public Task<CommitComment> Create(string owner, string name, string sha, NewComm
         /// <remarks>http://developer.github.com/v3/repos/comments/#create-a-commit-comment</remarks>
         public Task<CommitComment> Create(long repositoryId, string sha, NewCommitComment newCommitComment)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
-            Ensure.ArgumentNotNull(newCommitComment, "newCommitComment");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
+            Ensure.ArgumentNotNull(newCommitComment, nameof(newCommitComment));
 
             return ApiConnection.Post<CommitComment>(ApiUrls.CommitComments(repositoryId, sha), newCommitComment);
         }
@@ -204,9 +204,9 @@ public Task<CommitComment> Create(long repositoryId, string sha, NewCommitCommen
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         public Task<CommitComment> Update(string owner, string name, int number, string commentUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return ApiConnection.Patch<CommitComment>(ApiUrls.CommitComment(owner, name, number), new BodyWrapper(commentUpdate));
         }
@@ -220,7 +220,7 @@ public Task<CommitComment> Update(string owner, string name, int number, string
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         public Task<CommitComment> Update(long repositoryId, int number, string commentUpdate)
         {
-            Ensure.ArgumentNotNull(commentUpdate, "commentUpdate");
+            Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
             return ApiConnection.Patch<CommitComment>(ApiUrls.CommitComment(repositoryId, number), new BodyWrapper(commentUpdate));
         }
@@ -234,8 +234,8 @@ public Task<CommitComment> Update(long repositoryId, int number, string commentU
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         public Task Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.CommitComment(owner, name, number));
         }
diff --git a/Octokit/Clients/RepositoryCommitsClient.cs b/Octokit/Clients/RepositoryCommitsClient.cs
index 3731bf902d..e535ee18df 100644
--- a/Octokit/Clients/RepositoryCommitsClient.cs
+++ b/Octokit/Clients/RepositoryCommitsClient.cs
@@ -25,10 +25,10 @@ public RepositoryCommitsClient(IApiConnection apiConnection)
         /// <param name="head">The reference to use as the head commit</param>
         public Task<CompareResult> Compare(string owner, string name, string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(@base, nameof(@base));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             return ApiConnection.Get<CompareResult>(ApiUrls.RepoCompare(owner, name, @base, head));
         }
@@ -41,8 +41,8 @@ public Task<CompareResult> Compare(string owner, string name, string @base, stri
         /// <param name="head">The reference to use as the head commit</param>
         public Task<CompareResult> Compare(long repositoryId, string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(@base, nameof(@base));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             return ApiConnection.Get<CompareResult>(ApiUrls.RepoCompare(repositoryId, @base, head));
         }
@@ -55,9 +55,9 @@ public Task<CompareResult> Compare(long repositoryId, string @base, string head)
         /// <param name="reference">The reference for the commit (SHA)</param>
         public Task<GitHubCommit> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<GitHubCommit>(ApiUrls.RepositoryCommit(owner, name, reference));
         }
@@ -69,7 +69,7 @@ public Task<GitHubCommit> Get(string owner, string name, string reference)
         /// <param name="reference">The reference for the commit (SHA)</param>
         public Task<GitHubCommit> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<GitHubCommit>(ApiUrls.RepositoryCommit(repositoryId, reference));
         }
@@ -81,8 +81,8 @@ public Task<GitHubCommit> Get(long repositoryId, string reference)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, new CommitRequest(), ApiOptions.None);
         }
@@ -104,8 +104,8 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, new CommitRequest(), options);
         }
@@ -128,9 +128,9 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId, ApiOptions op
         /// <param name="request">Used to filter list of commits returned</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name, CommitRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(owner, name, request, ApiOptions.None);
         }
@@ -142,7 +142,7 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name, Commi
         /// <param name="request">Used to filter list of commits returned</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId, CommitRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(repositoryId, request, ApiOptions.None);
         }
@@ -156,10 +156,10 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId, CommitRequest
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name, CommitRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GitHubCommit>(ApiUrls.RepositoryCommits(owner, name), request.ToParametersDictionary(), options);
         }
@@ -172,8 +172,8 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(string owner, string name, Commi
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId, CommitRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GitHubCommit>(ApiUrls.RepositoryCommits(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -186,9 +186,9 @@ public Task<IReadOnlyList<GitHubCommit>> GetAll(long repositoryId, CommitRequest
         /// <param name="reference">The repository reference</param>
         public Task<string> GetSha1(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<string>(ApiUrls.RepositoryCommit(owner, name, reference), null, AcceptHeaders.CommitReferenceSha1MediaType);
         }
@@ -200,7 +200,7 @@ public Task<string> GetSha1(string owner, string name, string reference)
         /// <param name="reference">The repository reference</param>
         public Task<string> GetSha1(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<string>(ApiUrls.RepositoryCommit(repositoryId, reference), null, AcceptHeaders.CommitReferenceSha1MediaType);
         }
diff --git a/Octokit/Clients/RepositoryContentsClient.cs b/Octokit/Clients/RepositoryContentsClient.cs
index c0498e269e..96056f67fd 100644
--- a/Octokit/Clients/RepositoryContentsClient.cs
+++ b/Octokit/Clients/RepositoryContentsClient.cs
@@ -31,9 +31,9 @@ public RepositoryContentsClient(IApiConnection apiConnection) : base(apiConnecti
         /// <param name="path">The content path</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContents(string owner, string name, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             var url = ApiUrls.RepositoryContent(owner, name, path);
 
@@ -50,7 +50,7 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContents(string owner, strin
         /// <param name="path">The content path</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContents(long repositoryId, string path)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             var url = ApiUrls.RepositoryContent(repositoryId, path);
 
@@ -67,8 +67,8 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContents(long repositoryId,
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContents(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var url = ApiUrls.RepositoryContent(owner, name, string.Empty);
 
@@ -102,10 +102,10 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContents(long repositoryId)
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository�s default branch (usually master)</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(string owner, string name, string path, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             var url = ApiUrls.RepositoryContent(owner, name, path, reference);
 
@@ -123,8 +123,8 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(string owner,
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository’s default branch (usually master)</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(long repositoryId, string path, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             var url = ApiUrls.RepositoryContent(repositoryId, path, reference);
 
@@ -142,9 +142,9 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(long repositor
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository�s default branch (usually master)</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             var url = ApiUrls.RepositoryContent(owner, name, string.Empty, reference);
 
@@ -162,7 +162,7 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(string owner,
         /// <param name="reference">The name of the commit/branch/tag. Default: the repository’s default branch (usually master)</param>
         public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             var url = ApiUrls.RepositoryContent(repositoryId, string.Empty, reference);
 
@@ -180,8 +180,8 @@ public Task<IReadOnlyList<RepositoryContent>> GetAllContentsByRef(long repositor
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public async Task<Readme> GetReadme(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var endpoint = ApiUrls.RepositoryReadme(owner, name);
             var readmeInfo = await ApiConnection.Get<ReadmeResponse>(endpoint, null).ConfigureAwait(false);
@@ -216,8 +216,8 @@ public async Task<Readme> GetReadme(long repositoryId)
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<string> GetReadmeHtml(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetHtml(ApiUrls.RepositoryReadme(owner, name), null);
         }
@@ -243,8 +243,8 @@ public Task<string> GetReadmeHtml(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public Task<byte[]> GetArchive(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetArchive(owner, name, ArchiveFormat.Tarball, string.Empty);
         }
@@ -268,8 +268,8 @@ public Task<byte[]> GetArchive(long repositoryId)
         /// <param name="archiveFormat">The format of the archive. Can be either tarball or zipball</param>
         public Task<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetArchive(owner, name, archiveFormat, string.Empty);
         }
@@ -295,9 +295,9 @@ public Task<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat)
         /// <param name="reference">A valid Git reference.</param>
         public Task<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return GetArchive(owner, name, archiveFormat, reference, TimeSpan.FromMinutes(60));
         }
@@ -311,7 +311,7 @@ public Task<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveF
         /// <param name="reference">A valid Git reference.</param>
         public Task<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat, string reference)
         {
-            Ensure.ArgumentNotNull(reference, "reference");
+            Ensure.ArgumentNotNull(reference, nameof(reference));
 
             return GetArchive(repositoryId, archiveFormat, reference, TimeSpan.FromMinutes(60));
         }
@@ -327,10 +327,10 @@ public Task<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat, s
         /// <param name="timeout"> Time span until timeout </param>
         public async Task<byte[]> GetArchive(string owner, string name, ArchiveFormat archiveFormat, string reference, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(reference, "reference");
-            Ensure.GreaterThanZero(timeout, "timeout");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(reference, nameof(reference));
+            Ensure.GreaterThanZero(timeout, nameof(timeout));
 
             var endpoint = ApiUrls.RepositoryArchiveLink(owner, name, archiveFormat, reference);
 
@@ -349,8 +349,8 @@ public async Task<byte[]> GetArchive(string owner, string name, ArchiveFormat ar
         /// <param name="timeout"> Time span until timeout </param>
         public async Task<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFormat, string reference, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNull(reference, "reference");
-            Ensure.GreaterThanZero(timeout, "timeout");
+            Ensure.ArgumentNotNull(reference, nameof(reference));
+            Ensure.GreaterThanZero(timeout, nameof(timeout));
 
             var endpoint = ApiUrls.RepositoryArchiveLink(repositoryId, archiveFormat, reference);
 
@@ -368,10 +368,10 @@ public async Task<byte[]> GetArchive(long repositoryId, ArchiveFormat archiveFor
         /// <param name="request">Information about the file to create</param>
         public Task<RepositoryContentChangeSet> CreateFile(string owner, string name, string path, CreateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var createUrl = ApiUrls.RepositoryContent(owner, name, path);
             return ApiConnection.Put<RepositoryContentChangeSet>(createUrl, request);
@@ -385,8 +385,8 @@ public Task<RepositoryContentChangeSet> CreateFile(string owner, string name, st
         /// <param name="request">Information about the file to create</param>
         public Task<RepositoryContentChangeSet> CreateFile(long repositoryId, string path, CreateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var createUrl = ApiUrls.RepositoryContent(repositoryId, path);
             return ApiConnection.Put<RepositoryContentChangeSet>(createUrl, request);
@@ -401,10 +401,10 @@ public Task<RepositoryContentChangeSet> CreateFile(long repositoryId, string pat
         /// <param name="request">Information about the file to update</param>
         public Task<RepositoryContentChangeSet> UpdateFile(string owner, string name, string path, UpdateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var updateUrl = ApiUrls.RepositoryContent(owner, name, path);
             return ApiConnection.Put<RepositoryContentChangeSet>(updateUrl, request);
@@ -418,8 +418,8 @@ public Task<RepositoryContentChangeSet> UpdateFile(string owner, string name, st
         /// <param name="request">Information about the file to update</param>
         public Task<RepositoryContentChangeSet> UpdateFile(long repositoryId, string path, UpdateFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var updateUrl = ApiUrls.RepositoryContent(repositoryId, path);
             return ApiConnection.Put<RepositoryContentChangeSet>(updateUrl, request);
@@ -434,10 +434,10 @@ public Task<RepositoryContentChangeSet> UpdateFile(long repositoryId, string pat
         /// <param name="request">Information about the file to delete</param>
         public Task DeleteFile(string owner, string name, string path, DeleteFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var deleteUrl = ApiUrls.RepositoryContent(owner, name, path);
             return ApiConnection.Delete(deleteUrl, request);
@@ -451,8 +451,8 @@ public Task DeleteFile(string owner, string name, string path, DeleteFileRequest
         /// <param name="request">Information about the file to delete</param>
         public Task DeleteFile(long repositoryId, string path, DeleteFileRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var deleteUrl = ApiUrls.RepositoryContent(repositoryId, path);
             return ApiConnection.Delete(deleteUrl, request);
diff --git a/Octokit/Clients/RepositoryDeployKeysClient.cs b/Octokit/Clients/RepositoryDeployKeysClient.cs
index 81fd930f5a..65c543c3c2 100644
--- a/Octokit/Clients/RepositoryDeployKeysClient.cs
+++ b/Octokit/Clients/RepositoryDeployKeysClient.cs
@@ -32,8 +32,8 @@ public RepositoryDeployKeysClient(IApiConnection apiConnection)
         /// <param name="number">The id of the deploy key.</param>
         public Task<DeployKey> Get(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<DeployKey>(ApiUrls.RepositoryDeployKey(owner, name, number));
         }
@@ -61,8 +61,8 @@ public Task<DeployKey> Get(long repositoryId, int number)
         /// <param name="name">The name of the repository.</param>
         public Task<IReadOnlyList<DeployKey>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -90,9 +90,9 @@ public Task<IReadOnlyList<DeployKey>> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<DeployKey>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<DeployKey>(ApiUrls.RepositoryDeployKeys(owner, name), options);
         }
@@ -107,7 +107,7 @@ public Task<IReadOnlyList<DeployKey>> GetAll(string owner, string name, ApiOptio
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<DeployKey>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<DeployKey>(ApiUrls.RepositoryDeployKeys(repositoryId), options);
         }
@@ -123,9 +123,9 @@ public Task<IReadOnlyList<DeployKey>> GetAll(long repositoryId, ApiOptions optio
         /// <param name="newDeployKey">The deploy key to create for the repository.</param>
         public Task<DeployKey> Create(string owner, string name, NewDeployKey newDeployKey)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newDeployKey, "newDeployKey");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newDeployKey, nameof(newDeployKey));
 
             if (string.IsNullOrWhiteSpace(newDeployKey.Title))
                 throw new ArgumentException("The new deploy key's title must not be null.");
@@ -146,7 +146,7 @@ public Task<DeployKey> Create(string owner, string name, NewDeployKey newDeployK
         /// <param name="newDeployKey">The deploy key to create for the repository.</param>
         public Task<DeployKey> Create(long repositoryId, NewDeployKey newDeployKey)
         {
-            Ensure.ArgumentNotNull(newDeployKey, "newDeployKey");
+            Ensure.ArgumentNotNull(newDeployKey, nameof(newDeployKey));
 
             if (string.IsNullOrWhiteSpace(newDeployKey.Title))
                 throw new ArgumentException("The new deploy key's title must not be null.");
@@ -168,8 +168,8 @@ public Task<DeployKey> Create(long repositoryId, NewDeployKey newDeployKey)
         /// <param name="number">The id of the deploy key to delete.</param>
         public Task Delete(string owner, string name, int number)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.RepositoryDeployKey(owner, name, number));
         }
diff --git a/Octokit/Clients/RepositoryForksClient.cs b/Octokit/Clients/RepositoryForksClient.cs
index 76ca34f973..9dc093a13d 100644
--- a/Octokit/Clients/RepositoryForksClient.cs
+++ b/Octokit/Clients/RepositoryForksClient.cs
@@ -30,8 +30,8 @@ public RepositoryForksClient(IApiConnection apiConnection)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Repository>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -59,9 +59,9 @@ public Task<IReadOnlyList<Repository>> GetAll(long repositoryId)
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.RepositoryForks(owner, name), options);
         }
@@ -76,7 +76,7 @@ public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, ApiOpti
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.RepositoryForks(repositoryId), options);
         }
@@ -92,9 +92,9 @@ public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, ApiOptions opti
         /// <param name="request">Used to request and filter a list of repository forks</param>
         public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, RepositoryForksListRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(owner, name, request, ApiOptions.None);
         }
@@ -109,7 +109,7 @@ public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, Reposit
         /// <param name="request">Used to request and filter a list of repository forks</param>
         public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, RepositoryForksListRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAll(repositoryId, request, ApiOptions.None);
         }
@@ -126,10 +126,10 @@ public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, RepositoryForks
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, RepositoryForksListRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.RepositoryForks(owner, name), request.ToParametersDictionary(), options);
         }
@@ -145,8 +145,8 @@ public Task<IReadOnlyList<Repository>> GetAll(string owner, string name, Reposit
         /// <param name="options">Options for changing the API response</param>
         public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, RepositoryForksListRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.RepositoryForks(repositoryId), request.ToParametersDictionary(), options);
         }
@@ -162,9 +162,9 @@ public Task<IReadOnlyList<Repository>> GetAll(long repositoryId, RepositoryForks
         /// <param name="fork">Used to fork a repository</param>
         public Task<Repository> Create(string owner, string name, NewRepositoryFork fork)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(fork, "fork");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(fork, nameof(fork));
 
             return ApiConnection.Post<Repository>(ApiUrls.RepositoryForks(owner, name), fork);
         }
@@ -179,7 +179,7 @@ public Task<Repository> Create(string owner, string name, NewRepositoryFork fork
         /// <param name="fork">Used to fork a repository</param>
         public Task<Repository> Create(long repositoryId, NewRepositoryFork fork)
         {
-            Ensure.ArgumentNotNull(fork, "fork");
+            Ensure.ArgumentNotNull(fork, nameof(fork));
 
             return ApiConnection.Post<Repository>(ApiUrls.RepositoryForks(repositoryId), fork);
         }
diff --git a/Octokit/Clients/RepositoryHooksClient.cs b/Octokit/Clients/RepositoryHooksClient.cs
index 7a0ee46fc0..81f4c9c7db 100644
--- a/Octokit/Clients/RepositoryHooksClient.cs
+++ b/Octokit/Clients/RepositoryHooksClient.cs
@@ -28,8 +28,8 @@ public RepositoryHooksClient(IApiConnection apiConnection)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public Task<IReadOnlyList<RepositoryHook>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -53,9 +53,9 @@ public Task<IReadOnlyList<RepositoryHook>> GetAll(long repositoryId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public Task<IReadOnlyList<RepositoryHook>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryHook>(ApiUrls.RepositoryHooks(owner, name), options);
         }
@@ -68,7 +68,7 @@ public Task<IReadOnlyList<RepositoryHook>> GetAll(string owner, string name, Api
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#list">API documentation</a> for more information.</remarks>
         public Task<IReadOnlyList<RepositoryHook>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryHook>(ApiUrls.RepositoryHooks(repositoryId), options);
         }
@@ -82,8 +82,8 @@ public Task<IReadOnlyList<RepositoryHook>> GetAll(long repositoryId, ApiOptions
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#get-single-hook">API documentation</a> for more information.</remarks>
         public Task<RepositoryHook> Get(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<RepositoryHook>(ApiUrls.RepositoryHookById(owner, name, hookId));
         }
@@ -108,9 +108,9 @@ public Task<RepositoryHook> Get(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#create-a-hook">API documentation</a> for more information.</remarks>
         public Task<RepositoryHook> Create(string owner, string name, NewRepositoryHook hook)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return ApiConnection.Post<RepositoryHook>(ApiUrls.RepositoryHooks(owner, name), hook.ToRequest());
         }
@@ -123,7 +123,7 @@ public Task<RepositoryHook> Create(string owner, string name, NewRepositoryHook
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#create-a-hook">API documentation</a> for more information.</remarks>
         public Task<RepositoryHook> Create(long repositoryId, NewRepositoryHook hook)
         {
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return ApiConnection.Post<RepositoryHook>(ApiUrls.RepositoryHooks(repositoryId), hook.ToRequest());
         }
@@ -138,9 +138,9 @@ public Task<RepositoryHook> Create(long repositoryId, NewRepositoryHook hook)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public Task<RepositoryHook> Edit(string owner, string name, int hookId, EditRepositoryHook hook)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return ApiConnection.Patch<RepositoryHook>(ApiUrls.RepositoryHookById(owner, name, hookId), hook);
         }
@@ -154,7 +154,7 @@ public Task<RepositoryHook> Edit(string owner, string name, int hookId, EditRepo
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public Task<RepositoryHook> Edit(long repositoryId, int hookId, EditRepositoryHook hook)
         {
-            Ensure.ArgumentNotNull(hook, "hook");
+            Ensure.ArgumentNotNull(hook, nameof(hook));
 
             return ApiConnection.Patch<RepositoryHook>(ApiUrls.RepositoryHookById(repositoryId, hookId), hook);
         }
@@ -170,8 +170,8 @@ public Task<RepositoryHook> Edit(long repositoryId, int hookId, EditRepositoryHo
         /// is not subscribed to push events, the server will respond with 204 but no test POST will be generated.</remarks>
         public Task Test(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Post(ApiUrls.RepositoryHookTest(owner, name, hookId));
         }
@@ -198,8 +198,8 @@ public Task Test(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#edit-a-hook">API documentation</a> for more information.</remarks>
         public Task Ping(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Post(ApiUrls.RepositoryHookPing(owner, name, hookId));
         }
@@ -224,8 +224,8 @@ public Task Ping(long repositoryId, int hookId)
         /// <remarks>See <a href="http://developer.github.com/v3/repos/hooks/#delete-a-hook">API documentation</a> for more information.</remarks>
         public Task Delete(string owner, string name, int hookId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Delete(ApiUrls.RepositoryHookById(owner, name, hookId));
         }
diff --git a/Octokit/Clients/RepositoryInvitationsClient.cs b/Octokit/Clients/RepositoryInvitationsClient.cs
index fa326a3547..3a644933be 100644
--- a/Octokit/Clients/RepositoryInvitationsClient.cs
+++ b/Octokit/Clients/RepositoryInvitationsClient.cs
@@ -104,7 +104,7 @@ public Task<IReadOnlyList<RepositoryInvitation>> GetAllForCurrent()
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<RepositoryInvitation>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
             return ApiConnection.GetAll<RepositoryInvitation>(ApiUrls.UserInvitations(), null, AcceptHeaders.InvitationsApiPreview, options);
         }
 
@@ -132,7 +132,7 @@ public Task<IReadOnlyList<RepositoryInvitation>> GetAllForRepository(long reposi
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<IReadOnlyList<RepositoryInvitation>> GetAllForRepository(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
             return ApiConnection.GetAll<RepositoryInvitation>(ApiUrls.RepositoryInvitations(repositoryId), null, AcceptHeaders.InvitationsApiPreview, options);
         }
 
@@ -148,7 +148,7 @@ public Task<IReadOnlyList<RepositoryInvitation>> GetAllForRepository(long reposi
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         public Task<RepositoryInvitation> Edit(long repositoryId, int invitationId, InvitationUpdate permissions)
         {
-            Ensure.ArgumentNotNull(permissions, "permissions");
+            Ensure.ArgumentNotNull(permissions, nameof(permissions));
 
             return ApiConnection.Patch<RepositoryInvitation>(ApiUrls.RepositoryInvitations(repositoryId, invitationId), permissions, AcceptHeaders.InvitationsApiPreview);
         }
diff --git a/Octokit/Clients/RepositoryPagesClient.cs b/Octokit/Clients/RepositoryPagesClient.cs
index f57412e45d..317b751573 100644
--- a/Octokit/Clients/RepositoryPagesClient.cs
+++ b/Octokit/Clients/RepositoryPagesClient.cs
@@ -29,8 +29,8 @@ public RepositoryPagesClient(IApiConnection apiConnection) : base(apiConnection)
         /// </remarks>
         public Task<Page> Get(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<Page>(ApiUrls.RepositoryPage(owner, name));
         }
@@ -57,8 +57,8 @@ public Task<Page> Get(long repositoryId)
         /// </remarks>
         public Task<IReadOnlyList<PagesBuild>> GetAll(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAll(owner, name, ApiOptions.None);
         }
@@ -86,9 +86,9 @@ public Task<IReadOnlyList<PagesBuild>> GetAll(long repositoryId)
         /// </remarks>
         public Task<IReadOnlyList<PagesBuild>> GetAll(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.RepositoryPageBuilds(owner, name);
             return ApiConnection.GetAll<PagesBuild>(endpoint, options);
@@ -104,7 +104,7 @@ public Task<IReadOnlyList<PagesBuild>> GetAll(string owner, string name, ApiOpti
         /// </remarks>
         public Task<IReadOnlyList<PagesBuild>> GetAll(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.RepositoryPageBuilds(repositoryId);
             return ApiConnection.GetAll<PagesBuild>(endpoint, options);
@@ -120,8 +120,8 @@ public Task<IReadOnlyList<PagesBuild>> GetAll(long repositoryId, ApiOptions opti
         /// </remarks>
         public Task<PagesBuild> GetLatest(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Get<PagesBuild>(ApiUrls.RepositoryPageBuildsLatest(owner, name));
         }
@@ -148,8 +148,8 @@ public Task<PagesBuild> GetLatest(long repositoryId)
         /// </remarks>
         public Task<PagesBuild> RequestPageBuild(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.Post<PagesBuild>(ApiUrls.RepositoryPageBuilds(owner, name), AcceptHeaders.PagesApiPreview);
         }
diff --git a/Octokit/Clients/RepositoryTrafficClient.cs b/Octokit/Clients/RepositoryTrafficClient.cs
index 3b5199b1a8..4df2640b0e 100644
--- a/Octokit/Clients/RepositoryTrafficClient.cs
+++ b/Octokit/Clients/RepositoryTrafficClient.cs
@@ -51,8 +51,8 @@ public Task<IReadOnlyList<RepositoryTrafficPath>> GetAllPaths(long repositoryId)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<RepositoryTrafficPath>> GetAllPaths(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<RepositoryTrafficPath>(ApiUrls.RepositoryTrafficPaths(owner, name), AcceptHeaders.RepositoryTrafficApiPreview);
         }
@@ -98,8 +98,8 @@ public Task<IReadOnlyList<RepositoryTrafficReferrer>> GetAllReferrers(long repos
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<RepositoryTrafficReferrer>> GetAllReferrers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetAll<RepositoryTrafficReferrer>(ApiUrls.RepositoryTrafficReferrers(owner, name), AcceptHeaders.RepositoryTrafficApiPreview);
         }
@@ -112,7 +112,7 @@ public Task<IReadOnlyList<RepositoryTrafficReferrer>> GetAllReferrers(string own
         /// <param name="per">Breakdown per day or week</param>
         public Task<RepositoryTrafficCloneSummary> GetClones(long repositoryId, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return ApiConnection.Get<RepositoryTrafficCloneSummary>(ApiUrls.RepositoryTrafficClones(repositoryId), per.ToParametersDictionary(), AcceptHeaders.RepositoryTrafficApiPreview);
         }
@@ -126,9 +126,9 @@ public Task<RepositoryTrafficCloneSummary> GetClones(long repositoryId, Reposito
         /// <param name="per">Breakdown per day or week</param>
         public Task<RepositoryTrafficCloneSummary> GetClones(string owner, string name, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return ApiConnection.Get<RepositoryTrafficCloneSummary>(ApiUrls.RepositoryTrafficClones(owner, name), per.ToParametersDictionary(), AcceptHeaders.RepositoryTrafficApiPreview);
         }
@@ -141,7 +141,7 @@ public Task<RepositoryTrafficCloneSummary> GetClones(string owner, string name,
         /// <param name="per">Breakdown per day or week</param>
         public Task<RepositoryTrafficViewSummary> GetViews(long repositoryId, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return ApiConnection.Get<RepositoryTrafficViewSummary>(ApiUrls.RepositoryTrafficViews(repositoryId), per.ToParametersDictionary(), AcceptHeaders.RepositoryTrafficApiPreview);
         }
@@ -155,9 +155,9 @@ public Task<RepositoryTrafficViewSummary> GetViews(long repositoryId, Repository
         /// <param name="per">Breakdown per day or week</param>
         public Task<RepositoryTrafficViewSummary> GetViews(string owner, string name, RepositoryTrafficRequest per)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(per, "per");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(per, nameof(per));
 
             return ApiConnection.Get<RepositoryTrafficViewSummary>(ApiUrls.RepositoryTrafficViews(owner, name), per.ToParametersDictionary(), AcceptHeaders.RepositoryTrafficApiPreview);
         }
diff --git a/Octokit/Clients/SearchClient.cs b/Octokit/Clients/SearchClient.cs
index 7712d5971a..aa6c802449 100644
--- a/Octokit/Clients/SearchClient.cs
+++ b/Octokit/Clients/SearchClient.cs
@@ -27,7 +27,7 @@ public SearchClient(IApiConnection apiConnection)
         /// <returns>List of repos</returns>
         public Task<SearchRepositoryResult> SearchRepo(SearchRepositoriesRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return ApiConnection.Get<SearchRepositoryResult>(ApiUrls.SearchRepositories(), search.Parameters);
         }
 
@@ -39,7 +39,7 @@ public Task<SearchRepositoryResult> SearchRepo(SearchRepositoriesRequest search)
         /// <returns>List of users</returns>
         public Task<SearchUsersResult> SearchUsers(SearchUsersRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return ApiConnection.Get<SearchUsersResult>(ApiUrls.SearchUsers(), search.Parameters);
         }
 
@@ -51,7 +51,7 @@ public Task<SearchUsersResult> SearchUsers(SearchUsersRequest search)
         /// <returns>List of issues</returns>
         public Task<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return ApiConnection.Get<SearchIssuesResult>(ApiUrls.SearchIssues(), search.Parameters);
         }
 
@@ -63,7 +63,7 @@ public Task<SearchIssuesResult> SearchIssues(SearchIssuesRequest search)
         /// <returns>List of files</returns>
         public Task<SearchCodeResult> SearchCode(SearchCodeRequest search)
         {
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(search, nameof(search));
             return ApiConnection.Get<SearchCodeResult>(ApiUrls.SearchCode(), search.Parameters);
         }
     }
diff --git a/Octokit/Clients/StarredClient.cs b/Octokit/Clients/StarredClient.cs
index c766aaec17..44f714a372 100644
--- a/Octokit/Clients/StarredClient.cs
+++ b/Octokit/Clients/StarredClient.cs
@@ -28,8 +28,8 @@ public StarredClient(IApiConnection apiConnection) : base(apiConnection)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllStargazers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllStargazers(owner, name, ApiOptions.None);
         }
@@ -53,9 +53,9 @@ public Task<IReadOnlyList<User>> GetAllStargazers(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllStargazers(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Stargazers(owner, name), options);
         }
@@ -68,7 +68,7 @@ public Task<IReadOnlyList<User>> GetAllStargazers(string owner, string name, Api
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllStargazers(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Stargazers(repositoryId), options);
         }
@@ -81,8 +81,8 @@ public Task<IReadOnlyList<User>> GetAllStargazers(long repositoryId, ApiOptions
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<UserStar>> GetAllStargazersWithTimestamps(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllStargazersWithTimestamps(owner, name, ApiOptions.None);
         }
@@ -106,9 +106,9 @@ public Task<IReadOnlyList<UserStar>> GetAllStargazersWithTimestamps(long reposit
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<UserStar>> GetAllStargazersWithTimestamps(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<UserStar>(ApiUrls.Stargazers(owner, name), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -121,7 +121,7 @@ public Task<IReadOnlyList<UserStar>> GetAllStargazersWithTimestamps(string owner
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<UserStar>> GetAllStargazersWithTimestamps(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<UserStar>(ApiUrls.Stargazers(repositoryId), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -142,7 +142,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Starred(), options);
         }
@@ -163,7 +163,7 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps()
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryStar>(ApiUrls.Starred(), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -177,7 +177,7 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(ApiOpt
             Justification = "But i think i do need star-specific request parameters")]
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(StarredRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrent(request, ApiOptions.None);
         }
@@ -190,8 +190,8 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent(StarredRequest request)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Starred(), request.ToParametersDictionary(), options);
         }
@@ -205,7 +205,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent(StarredRequest request,
             Justification = "But i think i do need star-specific request parameters")]
         public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(StarredRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForCurrentWithTimestamps(request, ApiOptions.None);
         }
@@ -218,8 +218,8 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(Starre
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryStar>(ApiUrls.Starred(), request.ToParametersDictionary(), AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -231,7 +231,7 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForCurrentWithTimestamps(Starre
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -244,8 +244,8 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.StarredByUser(user), options);
         }
@@ -257,7 +257,7 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user, ApiOptions opt
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUserWithTimestamps(user, ApiOptions.None);
         }
@@ -270,8 +270,8 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string us
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryStar>(ApiUrls.StarredByUser(user), null, AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -285,8 +285,8 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string us
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user, StarredRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForUser(user, request, ApiOptions.None);
         }
@@ -300,9 +300,9 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user, StarredRequest
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user, StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.StarredByUser(user), request.ToParametersDictionary(), options);
         }
@@ -316,8 +316,8 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user, StarredRequest
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
         public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string user, StarredRequest request)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return GetAllForUserWithTimestamps(user, request, ApiOptions.None);
         }
@@ -331,9 +331,9 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string us
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string user, StarredRequest request, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(request, "request");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(request, nameof(request));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<RepositoryStar>(ApiUrls.StarredByUser(user), request.ToParametersDictionary(), AcceptHeaders.StarCreationTimestamps, options);
         }
@@ -346,8 +346,8 @@ public Task<IReadOnlyList<RepositoryStar>> GetAllForUserWithTimestamps(string us
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public async Task<bool> CheckStarred(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             try
             {
@@ -367,8 +367,8 @@ public async Task<bool> CheckStarred(string owner, string name)
         /// <param name="name">The name of the repository to star</param>
         public async Task<bool> StarRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             try
             {
@@ -388,8 +388,8 @@ public async Task<bool> StarRepo(string owner, string name)
         /// <param name="name">The name of the repository to unstar</param>
         public async Task<bool> RemoveStarFromRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             try
             {
diff --git a/Octokit/Clients/StatisticsClient.cs b/Octokit/Clients/StatisticsClient.cs
index 530ed029cc..99a190778e 100644
--- a/Octokit/Clients/StatisticsClient.cs
+++ b/Octokit/Clients/StatisticsClient.cs
@@ -28,8 +28,8 @@ public StatisticsClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="name">The name of the repository</param>
         public Task<IReadOnlyList<Contributor>> GetContributors(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetContributors(owner, name, CancellationToken.None);
         }
@@ -51,8 +51,8 @@ public Task<IReadOnlyList<Contributor>> GetContributors(long repositoryId)
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public Task<IReadOnlyList<Contributor>> GetContributors(string owner, string name, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return ApiConnection.GetQueuedOperation<Contributor>(ApiUrls.StatsContributors(owner, name), cancellationToken);
         }
@@ -74,8 +74,8 @@ public Task<IReadOnlyList<Contributor>> GetContributors(long repositoryId, Cance
         /// <param name="name">The name of the repository</param>
         public Task<CommitActivity> GetCommitActivity(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetCommitActivity(owner, name, CancellationToken.None);
         }
@@ -97,8 +97,8 @@ public Task<CommitActivity> GetCommitActivity(long repositoryId)
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<CommitActivity> GetCommitActivity(string owner, string name, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var activity = await ApiConnection.GetQueuedOperation<WeeklyCommitActivity>(ApiUrls.StatsCommitActivity(owner, name), cancellationToken).ConfigureAwait(false);
             return new CommitActivity(activity);
@@ -122,8 +122,8 @@ public async Task<CommitActivity> GetCommitActivity(long repositoryId, Cancellat
         /// <param name="name">The name of the repository</param>
         public Task<CodeFrequency> GetCodeFrequency(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetCodeFrequency(owner, name, CancellationToken.None);
         }
@@ -145,8 +145,8 @@ public Task<CodeFrequency> GetCodeFrequency(long repositoryId)
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<CodeFrequency> GetCodeFrequency(string owner, string name, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var rawFrequencies = await ApiConnection.GetQueuedOperation<long[]>(ApiUrls.StatsCodeFrequency(owner, name), cancellationToken).ConfigureAwait(false);
             return new CodeFrequency(rawFrequencies);
@@ -170,8 +170,8 @@ public async Task<CodeFrequency> GetCodeFrequency(long repositoryId, Cancellatio
         /// <param name="name">The name of the repository</param>
         public Task<Participation> GetParticipation(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetParticipation(owner, name, CancellationToken.None);
         }
@@ -193,8 +193,8 @@ public Task<Participation> GetParticipation(long repositoryId)
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<Participation> GetParticipation(string owner, string name, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var result = await ApiConnection.GetQueuedOperation<Participation>(ApiUrls.StatsParticipation(owner, name), cancellationToken).ConfigureAwait(false);
             return result.FirstOrDefault();
@@ -218,8 +218,8 @@ public async Task<Participation> GetParticipation(long repositoryId, Cancellatio
         /// <param name="name">The name of the repository</param>
         public Task<PunchCard> GetPunchCard(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetPunchCard(owner, name, CancellationToken.None);
         }
@@ -241,8 +241,8 @@ public Task<PunchCard> GetPunchCard(long repositoryId)
         /// <param name="cancellationToken">A token used to cancel this potentially long running request</param>
         public async Task<PunchCard> GetPunchCard(string owner, string name, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             var punchCardData = await ApiConnection.GetQueuedOperation<int[]>(ApiUrls.StatsPunchCard(owner, name), cancellationToken).ConfigureAwait(false);
             return new PunchCard(punchCardData);
diff --git a/Octokit/Clients/TagsClient.cs b/Octokit/Clients/TagsClient.cs
index 71a6eb7d75..9a1810542b 100644
--- a/Octokit/Clients/TagsClient.cs
+++ b/Octokit/Clients/TagsClient.cs
@@ -30,9 +30,9 @@ public TagsClient(IApiConnection apiConnection)
         /// <param name="reference">Tha sha reference of the tag</param>
         public Task<GitTag> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<GitTag>(ApiUrls.Tag(owner, name, reference), null, AcceptHeaders.SignatureVerificationPreview);
         }
@@ -47,7 +47,7 @@ public Task<GitTag> Get(string owner, string name, string reference)
         /// <param name="reference">Tha sha reference of the tag</param>
         public Task<GitTag> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<GitTag>(ApiUrls.Tag(repositoryId, reference), null, AcceptHeaders.SignatureVerificationPreview);
         }
@@ -63,9 +63,9 @@ public Task<GitTag> Get(long repositoryId, string reference)
         /// <param name="tag">The tag to create</param>
         public Task<GitTag> Create(string owner, string name, NewTag tag)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(tag, "tag");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(tag, nameof(tag));
 
             return ApiConnection.Post<GitTag>(ApiUrls.CreateTag(owner, name), tag);
         }
@@ -80,7 +80,7 @@ public Task<GitTag> Create(string owner, string name, NewTag tag)
         /// <param name="tag">The tag to create</param>
         public Task<GitTag> Create(long repositoryId, NewTag tag)
         {
-            Ensure.ArgumentNotNull(tag, "tag");
+            Ensure.ArgumentNotNull(tag, nameof(tag));
 
             return ApiConnection.Post<GitTag>(ApiUrls.CreateTag(repositoryId), tag);
         }
diff --git a/Octokit/Clients/TeamsClient.cs b/Octokit/Clients/TeamsClient.cs
index 894cf04645..ebc934eccb 100644
--- a/Octokit/Clients/TeamsClient.cs
+++ b/Octokit/Clients/TeamsClient.cs
@@ -57,8 +57,8 @@ public Task<IReadOnlyList<Team>> GetAll(string org)
         /// <returns>A list of the orgs's teams <see cref="Team"/>s.</returns>
         public Task<IReadOnlyList<Team>> GetAll(string org, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.OrganizationTeams(org);
             return ApiConnection.GetAll<Team>(endpoint, null, AcceptHeaders.NestedTeamsPreview, options);
@@ -82,7 +82,7 @@ public Task<IReadOnlyList<Team>> GetAllForCurrent()
         /// <returns>A list of the user's <see cref="Team"/>s.</returns>
         public Task<IReadOnlyList<Team>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.UserTeams();
 
@@ -140,7 +140,7 @@ public Task<IReadOnlyList<User>> GetAllMembers(int id)
         /// <param name="options">Options to change API behaviour.</param>
         public Task<IReadOnlyList<User>> GetAllMembers(int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.TeamMembers(id);
 
@@ -190,7 +190,7 @@ public Task<IReadOnlyList<User>> GetAllMembers(int id, TeamMembersRequest reques
         [Obsolete("Please use GetMembershipDetails instead")]
         public async Task<TeamMembership> GetMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             var endpoint = ApiUrls.TeamMember(id, login);
 
@@ -236,8 +236,8 @@ public Task<TeamMembershipDetails> GetMembershipDetails(int id, string login)
         /// <returns>Newly created <see cref="Team"/></returns>
         public Task<Team> Create(string org, NewTeam team)
         {
-            Ensure.ArgumentNotNullOrEmptyString(org, "org");
-            Ensure.ArgumentNotNull(team, "team");
+            Ensure.ArgumentNotNullOrEmptyString(org, nameof(org));
+            Ensure.ArgumentNotNull(team, nameof(team));
 
             var endpoint = ApiUrls.OrganizationTeams(org);
             return ApiConnection.Post<Team>(endpoint, team, AcceptHeaders.NestedTeamsPreview);
@@ -250,7 +250,7 @@ public Task<Team> Create(string org, NewTeam team)
         /// <returns>Updated <see cref="Team"/></returns>
         public Task<Team> Update(int id, UpdateTeam team)
         {
-            Ensure.ArgumentNotNull(team, "team");
+            Ensure.ArgumentNotNull(team, nameof(team));
 
             var endpoint = ApiUrls.Teams(id);
             return ApiConnection.Patch<Team>(endpoint, team, AcceptHeaders.NestedTeamsPreview);
@@ -279,7 +279,7 @@ public Task Delete(int id)
         [Obsolete("Please use AddOrEditMembership instead")]
         public async Task<TeamMembership> AddMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             var endpoint = ApiUrls.TeamMember(id, login);
 
@@ -334,7 +334,7 @@ public Task<TeamMembershipDetails> AddOrEditMembership(int id, string login, Upd
         /// <returns><see langword="true"/> if the user was removed from the team; <see langword="false"/> otherwise.</returns>
         public async Task<bool> RemoveMembership(int id, string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             var endpoint = ApiUrls.TeamMember(id, login);
 
@@ -370,7 +370,7 @@ public Task<IReadOnlyList<Repository>> GetAllRepositories(int id)
         /// <returns>The team's repositories</returns>
         public Task<IReadOnlyList<Repository>> GetAllRepositories(int id, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             var endpoint = ApiUrls.TeamRepositories(id);
 
@@ -384,8 +384,8 @@ public Task<IReadOnlyList<Repository>> GetAllRepositories(int id, ApiOptions opt
         /// <returns></returns>
         public async Task<bool> AddRepository(int id, string organization, string repoName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
 
@@ -411,8 +411,8 @@ public async Task<bool> AddRepository(int id, string organization, string repoNa
         /// <returns></returns>
         public async Task<bool> AddRepository(int id, string organization, string repoName, RepositoryPermissionRequest permission)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
 
@@ -434,8 +434,8 @@ public async Task<bool> AddRepository(int id, string organization, string repoNa
         /// <returns></returns>
         public async Task<bool> RemoveRepository(int id, string organization, string repoName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(repoName, "repoName");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
             var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
 
@@ -463,8 +463,8 @@ public async Task<bool> RemoveRepository(int id, string organization, string rep
         /// <returns><see langword="true"/> if the repository is managed by the given team; <see langword="false"/> otherwise.</returns>
         public async Task<bool> IsRepositoryManagedByTeam(int id, string owner, string repo)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(repo, "repo");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
 
             var endpoint = ApiUrls.TeamRepository(id, owner, repo);
 
diff --git a/Octokit/Clients/TreesClient.cs b/Octokit/Clients/TreesClient.cs
index e21944ba57..d5b39c5550 100644
--- a/Octokit/Clients/TreesClient.cs
+++ b/Octokit/Clients/TreesClient.cs
@@ -32,9 +32,9 @@ public TreesClient(IApiConnection apiConnection)
         /// <param name="reference">The SHA that references the tree</param>
         public Task<TreeResponse> Get(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<TreeResponse>(ApiUrls.Tree(owner, name, reference));
         }
@@ -49,7 +49,7 @@ public Task<TreeResponse> Get(string owner, string name, string reference)
         /// <param name="reference">The SHA that references the tree</param>
         public Task<TreeResponse> Get(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<TreeResponse>(ApiUrls.Tree(repositoryId, reference));
         }
@@ -65,9 +65,9 @@ public Task<TreeResponse> Get(long repositoryId, string reference)
         /// <param name="reference">The SHA that references the tree</param>
         public Task<TreeResponse> GetRecursive(string owner, string name, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<TreeResponse>(ApiUrls.TreeRecursive(owner, name, reference));
         }
@@ -82,7 +82,7 @@ public Task<TreeResponse> GetRecursive(string owner, string name, string referen
         /// <param name="reference">The SHA that references the tree</param>
         public Task<TreeResponse> GetRecursive(long repositoryId, string reference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
             return ApiConnection.Get<TreeResponse>(ApiUrls.TreeRecursive(repositoryId, reference));
         }
@@ -98,9 +98,9 @@ public Task<TreeResponse> GetRecursive(long repositoryId, string reference)
         /// <param name="newTree">The value of the new tree</param>
         public Task<TreeResponse> Create(string owner, string name, NewTree newTree)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newTree, "newTree");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newTree, nameof(newTree));
 
             if (newTree.Tree.Any(t => string.IsNullOrWhiteSpace(t.Mode)))
             {
@@ -120,7 +120,7 @@ public Task<TreeResponse> Create(string owner, string name, NewTree newTree)
         /// <param name="newTree">The value of the new tree</param>
         public Task<TreeResponse> Create(long repositoryId, NewTree newTree)
         {
-            Ensure.ArgumentNotNull(newTree, "newTree");
+            Ensure.ArgumentNotNull(newTree, nameof(newTree));
 
             if (newTree.Tree.Any(t => string.IsNullOrWhiteSpace(t.Mode)))
             {
diff --git a/Octokit/Clients/UserAdministrationClient.cs b/Octokit/Clients/UserAdministrationClient.cs
index cd7c14cbd7..f0595e0aeb 100644
--- a/Octokit/Clients/UserAdministrationClient.cs
+++ b/Octokit/Clients/UserAdministrationClient.cs
@@ -32,7 +32,7 @@ public UserAdministrationClient(IApiConnection apiConnection)
         /// <returns>The created <see cref="User"/> object</returns>
         public Task<User> Create(NewUser newUser)
         {
-            Ensure.ArgumentNotNull(newUser, "newUser");
+            Ensure.ArgumentNotNull(newUser, nameof(newUser));
 
             var endpoint = ApiUrls.UserAdministration();
 
@@ -52,8 +52,8 @@ public Task<User> Create(NewUser newUser)
         /// <returns>A <see cref="UserRenameResponse"/> object indicating the queued task message and Url to the user</returns>
         public Task<UserRenameResponse> Rename(string login, UserRename userRename)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(userRename, "userRename");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(userRename, nameof(userRename));
 
             var endpoint = ApiUrls.UserAdministration(login);
 
@@ -72,8 +72,8 @@ public Task<UserRenameResponse> Rename(string login, UserRename userRename)
         /// <returns>An <see cref="Authorization"/> object containing the impersonation token</returns>
         public Task<Authorization> CreateImpersonationToken(string login, NewImpersonationToken newImpersonationToken)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNull(newImpersonationToken, "newImpersonationToken");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNull(newImpersonationToken, nameof(newImpersonationToken));
 
             var endpoint = ApiUrls.UserAdministrationAuthorization(login);
 
@@ -91,7 +91,7 @@ public Task<Authorization> CreateImpersonationToken(string login, NewImpersonati
         /// <returns></returns>
         public async Task DeleteImpersonationToken(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             var endpoint = ApiUrls.UserAdministrationAuthorization(login);
 
@@ -113,7 +113,7 @@ public async Task DeleteImpersonationToken(string login)
         /// <returns></returns>
         public Task Promote(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             var endpoint = ApiUrls.UserAdministrationSiteAdmin(login);
             return ApiConnection.Put(endpoint);
         }
@@ -129,7 +129,7 @@ public Task Promote(string login)
         /// <returns></returns>
         public Task Demote(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             var endpoint = ApiUrls.UserAdministrationSiteAdmin(login);
             return ApiConnection.Delete(endpoint);
         }
@@ -145,7 +145,7 @@ public Task Demote(string login)
         /// <returns></returns>
         public Task Suspend(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             var endpoint = ApiUrls.UserAdministrationSuspension(login);
             return ApiConnection.Put(endpoint);
         }
@@ -161,7 +161,7 @@ public Task Suspend(string login)
         /// <returns></returns>
         public Task Unsuspend(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             var endpoint = ApiUrls.UserAdministrationSuspension(login);
             return ApiConnection.Delete(endpoint);
         }
@@ -191,7 +191,7 @@ public Task<IReadOnlyList<PublicKey>> ListAllPublicKeys()
         /// <returns></returns>
         public async Task Delete(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             var endpoint = ApiUrls.UserAdministration(login);
 
             var response = await Connection.Delete(endpoint).ConfigureAwait(false);
@@ -212,7 +212,7 @@ public async Task Delete(string login)
         /// <returns></returns>
         public async Task DeletePublicKey(int keyId)
         {
-            Ensure.ArgumentNotNull(keyId, "keyId");
+            Ensure.ArgumentNotNull(keyId, nameof(keyId));
             var endpoint = ApiUrls.UserAdministrationPublicKeys(keyId);
 
             var response = await Connection.Delete(endpoint).ConfigureAwait(false);
diff --git a/Octokit/Clients/UserEmailsClient.cs b/Octokit/Clients/UserEmailsClient.cs
index 9dd9736bc8..60ccd32150 100644
--- a/Octokit/Clients/UserEmailsClient.cs
+++ b/Octokit/Clients/UserEmailsClient.cs
@@ -42,7 +42,7 @@ public Task<IReadOnlyList<EmailAddress>> GetAll()
         /// <returns>The <see cref="EmailAddress"/>es for the authenticated user.</returns>
         public Task<IReadOnlyList<EmailAddress>> GetAll(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<EmailAddress>(ApiUrls.Emails(), options);
         }
@@ -57,7 +57,7 @@ public Task<IReadOnlyList<EmailAddress>> GetAll(ApiOptions options)
         /// <returns>Returns the added <see cref="EmailAddress"/>es.</returns>
         public Task<IReadOnlyList<EmailAddress>> Add(params string[] emailAddresses)
         {
-            Ensure.ArgumentNotNull(emailAddresses, "emailAddresses");
+            Ensure.ArgumentNotNull(emailAddresses, nameof(emailAddresses));
             if (emailAddresses.Any(string.IsNullOrWhiteSpace))
                 throw new ArgumentException("Cannot contain null, empty or whitespace values", "emailAddresses");
 
@@ -74,7 +74,7 @@ public Task<IReadOnlyList<EmailAddress>> Add(params string[] emailAddresses)
         /// <returns>Returns the added <see cref="EmailAddress"/>es.</returns>
         public Task Delete(params string[] emailAddresses)
         {
-            Ensure.ArgumentNotNull(emailAddresses, "emailAddresses");
+            Ensure.ArgumentNotNull(emailAddresses, nameof(emailAddresses));
             if (emailAddresses.Any(string.IsNullOrWhiteSpace))
                 throw new ArgumentException("Cannot contain null, empty or whitespace values", "emailAddresses");
 
diff --git a/Octokit/Clients/UserGpgKeysClient.cs b/Octokit/Clients/UserGpgKeysClient.cs
index db81b347f4..bf101385a7 100644
--- a/Octokit/Clients/UserGpgKeysClient.cs
+++ b/Octokit/Clients/UserGpgKeysClient.cs
@@ -43,7 +43,7 @@ public Task<IReadOnlyList<GpgKey>> GetAllForCurrent()
         /// <returns>A <see cref="IReadOnlyList{GpgKey}"/> of <see cref="GpgKey"/>s for the current user.</returns>
         public Task<IReadOnlyList<GpgKey>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<GpgKey>(ApiUrls.GpgKeys(), null, AcceptHeaders.GpgKeysPreview, options);
         }
@@ -71,7 +71,7 @@ public Task<GpgKey> Get(int id)
         /// <returns>The newly created <see cref="GpgKey"/>.</returns>
         public Task<GpgKey> Create(NewGpgKey newGpgKey)
         {
-            Ensure.ArgumentNotNull(newGpgKey, "newGpgKey");
+            Ensure.ArgumentNotNull(newGpgKey, nameof(newGpgKey));
 
             return ApiConnection.Post<GpgKey>(ApiUrls.GpgKeys(), newGpgKey, AcceptHeaders.GpgKeysPreview);
         }
diff --git a/Octokit/Clients/UserKeysClient.cs b/Octokit/Clients/UserKeysClient.cs
index a8d738ea1a..238b981dd8 100644
--- a/Octokit/Clients/UserKeysClient.cs
+++ b/Octokit/Clients/UserKeysClient.cs
@@ -26,7 +26,7 @@ public UserKeysClient(IApiConnection apiConnection)
         /// <returns>Lists the verified public keys for a user.</returns>
         public Task<IReadOnlyList<PublicKey>> GetAll(string userName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(userName, "userName");
+            Ensure.ArgumentNotNullOrEmptyString(userName, nameof(userName));
 
             return GetAll(userName, ApiOptions.None);
         }
@@ -42,8 +42,8 @@ public Task<IReadOnlyList<PublicKey>> GetAll(string userName)
         /// <returns>Lists the verified public keys for a user.</returns>
         public Task<IReadOnlyList<PublicKey>> GetAll(string userName, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(userName, "userName");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(userName, nameof(userName));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PublicKey>(ApiUrls.Keys(userName), options);
         }
@@ -70,7 +70,7 @@ public Task<IReadOnlyList<PublicKey>> GetAllForCurrent()
         /// <returns>Lists the current user's keys.</returns>
         public Task<IReadOnlyList<PublicKey>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<PublicKey>(ApiUrls.Keys(), options);
         }
@@ -98,7 +98,7 @@ public Task<PublicKey> Get(int id)
         /// <returns></returns>
         public Task<PublicKey> Create(NewPublicKey newKey)
         {
-            Ensure.ArgumentNotNull(newKey, "newKey");
+            Ensure.ArgumentNotNull(newKey, nameof(newKey));
 
             return ApiConnection.Post<PublicKey>(ApiUrls.Keys(), newKey);
         }
diff --git a/Octokit/Clients/UsersClient.cs b/Octokit/Clients/UsersClient.cs
index fc07ea234a..fce814bcad 100644
--- a/Octokit/Clients/UsersClient.cs
+++ b/Octokit/Clients/UsersClient.cs
@@ -57,7 +57,7 @@ public UsersClient(IApiConnection apiConnection) : base(apiConnection)
         /// <param name="login">The login name for the user</param>
         public Task<User> Get(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             return ApiConnection.Get<User>(ApiUrls.User(login));
         }
@@ -80,7 +80,7 @@ public Task<User> Current()
         /// <returns>A <see cref="User"/></returns>
         public Task<User> Update(UserUpdate user)
         {
-            Ensure.ArgumentNotNull(user, "user");
+            Ensure.ArgumentNotNull(user, nameof(user));
 
             return ApiConnection.Patch<User>(_userEndpoint, user);
         }
diff --git a/Octokit/Clients/WatchedClient.cs b/Octokit/Clients/WatchedClient.cs
index e599cc15d8..6dae2a125f 100644
--- a/Octokit/Clients/WatchedClient.cs
+++ b/Octokit/Clients/WatchedClient.cs
@@ -29,8 +29,8 @@ public WatchedClient(IApiConnection apiConnection)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllWatchers(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return GetAllWatchers(owner, name, ApiOptions.None);
         }
@@ -54,9 +54,9 @@ public Task<IReadOnlyList<User>> GetAllWatchers(long repositoryId)
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllWatchers(string owner, string name, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Watchers(owner, name), options);
         }
@@ -69,7 +69,7 @@ public Task<IReadOnlyList<User>> GetAllWatchers(string owner, string name, ApiOp
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public Task<IReadOnlyList<User>> GetAllWatchers(long repositoryId, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<User>(ApiUrls.Watchers(repositoryId), options);
         }
@@ -96,7 +96,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent()
         /// </returns>
         public Task<IReadOnlyList<Repository>> GetAllForCurrent(ApiOptions options)
         {
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.Watched(), options);
         }
@@ -111,7 +111,7 @@ public Task<IReadOnlyList<Repository>> GetAllForCurrent(ApiOptions options)
         /// </returns>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
 
             return GetAllForUser(user, ApiOptions.None);
         }
@@ -127,8 +127,8 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user)
         /// </returns>
         public Task<IReadOnlyList<Repository>> GetAllForUser(string user, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(user, "user");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNullOrEmptyString(user, nameof(user));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             return ApiConnection.GetAll<Repository>(ApiUrls.WatchedByUser(user), options);
         }
@@ -141,8 +141,8 @@ public Task<IReadOnlyList<Repository>> GetAllForUser(string user, ApiOptions opt
         /// <exception cref="AuthorizationException">Thrown if the client is not authenticated.</exception>
         public async Task<bool> CheckWatched(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             try
             {
@@ -185,9 +185,9 @@ public async Task<bool> CheckWatched(long repositoryId)
         /// <param name="newSubscription">A <see cref="NewSubscription"/> instance describing the new subscription to create</param>
         public Task<Subscription> WatchRepo(string owner, string name, NewSubscription newSubscription)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(newSubscription, "newSubscription");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(newSubscription, nameof(newSubscription));
 
             return ApiConnection.Put<Subscription>(ApiUrls.Watched(owner, name), newSubscription);
         }
@@ -199,7 +199,7 @@ public Task<Subscription> WatchRepo(string owner, string name, NewSubscription n
         /// <param name="newSubscription">A <see cref="NewSubscription"/> instance describing the new subscription to create</param>
         public Task<Subscription> WatchRepo(long repositoryId, NewSubscription newSubscription)
         {
-            Ensure.ArgumentNotNull(newSubscription, "newSubscription");
+            Ensure.ArgumentNotNull(newSubscription, nameof(newSubscription));
 
             return ApiConnection.Put<Subscription>(ApiUrls.Watched(repositoryId), newSubscription);
         }
@@ -211,8 +211,8 @@ public Task<Subscription> WatchRepo(long repositoryId, NewSubscription newSubscr
         /// <param name="name">The name of the repository to unstar</param>
         public async Task<bool> UnwatchRepo(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             try
             {
diff --git a/Octokit/Exceptions/ApiException.cs b/Octokit/Exceptions/ApiException.cs
index ce2c15e90a..d7b49d8540 100644
--- a/Octokit/Exceptions/ApiException.cs
+++ b/Octokit/Exceptions/ApiException.cs
@@ -66,7 +66,7 @@ public ApiException(IResponse response)
         public ApiException(IResponse response, Exception innerException)
             : base(null, innerException)
         {
-            Ensure.ArgumentNotNull(response, "response");
+            Ensure.ArgumentNotNull(response, nameof(response));
 
             StatusCode = response.StatusCode;
             ApiError = GetApiErrorFromExceptionMessage(response);
@@ -79,7 +79,7 @@ public ApiException(IResponse response, Exception innerException)
         /// <param name="innerException">The inner exception</param>
         protected ApiException(ApiException innerException)
         {
-            Ensure.ArgumentNotNull(innerException, "innerException");
+            Ensure.ArgumentNotNull(innerException, nameof(innerException));
 
             StatusCode = innerException.StatusCode;
             ApiError = innerException.ApiError;
@@ -95,7 +95,7 @@ protected ApiException(HttpStatusCode statusCode, Exception innerException)
         protected ApiException(ApiError apiError, HttpStatusCode statusCode, Exception innerException)
             : base(null, innerException)
         {
-            Ensure.ArgumentNotNull(apiError, "apiError");
+            Ensure.ArgumentNotNull(apiError, nameof(apiError));
 
             ApiError = apiError;
             StatusCode = statusCode;
diff --git a/Octokit/Exceptions/RateLimitExceededException.cs b/Octokit/Exceptions/RateLimitExceededException.cs
index fe11f1b580..2daebf679b 100644
--- a/Octokit/Exceptions/RateLimitExceededException.cs
+++ b/Octokit/Exceptions/RateLimitExceededException.cs
@@ -42,7 +42,7 @@ public RateLimitExceededException(IResponse response) : this(response, null)
         /// <param name="innerException">The inner exception</param>
         public RateLimitExceededException(IResponse response, Exception innerException) : base(response, innerException)
         {
-            Ensure.ArgumentNotNull(response, "response");
+            Ensure.ArgumentNotNull(response, nameof(response));
 
             _rateLimit = response.ApiInfo.RateLimit;
         }
diff --git a/Octokit/Exceptions/RepositoryExistsException.cs b/Octokit/Exceptions/RepositoryExistsException.cs
index 3b847a9022..d3d773ef40 100644
--- a/Octokit/Exceptions/RepositoryExistsException.cs
+++ b/Octokit/Exceptions/RepositoryExistsException.cs
@@ -34,9 +34,9 @@ public RepositoryExistsException(
             ApiValidationException innerException)
             : base(innerException)
         {
-            Ensure.ArgumentNotNullOrEmptyString(organization, "organization");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(baseAddress, "baseAddress");
+            Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(baseAddress, nameof(baseAddress));
 
             Organization = organization;
             RepositoryName = name;
@@ -59,7 +59,7 @@ public RepositoryExistsException(
             ApiValidationException innerException)
             : base(innerException)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             RepositoryName = name;
 
diff --git a/Octokit/GitHubClient.cs b/Octokit/GitHubClient.cs
index df6002529c..754bcc6776 100644
--- a/Octokit/GitHubClient.cs
+++ b/Octokit/GitHubClient.cs
@@ -90,7 +90,7 @@ public GitHubClient(ProductHeaderValue productInformation, ICredentialStore cred
         /// <param name="connection">The underlying <seealso cref="IConnection"/> used to make requests</param>
         public GitHubClient(IConnection connection)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
 
             Connection = connection;
             var apiConnection = new ApiConnection(connection);
@@ -148,7 +148,7 @@ public Credentials Credentials
             // Note this is for convenience. We probably shouldn't allow this to be mutable.
             set
             {
-                Ensure.ArgumentNotNull(value, "value");
+                Ensure.ArgumentNotNull(value, nameof(value));
                 Connection.Credentials = value;
             }
         }
@@ -289,7 +289,7 @@ public Uri BaseAddress
 
         static Uri FixUpBaseUri(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             if (uri.Host.Equals("github.com") || uri.Host.Equals("api.github.com"))
             {
diff --git a/Octokit/Helpers/ApiExtensions.cs b/Octokit/Helpers/ApiExtensions.cs
index 194b1c103b..ffc8d978fc 100644
--- a/Octokit/Helpers/ApiExtensions.cs
+++ b/Octokit/Helpers/ApiExtensions.cs
@@ -21,8 +21,8 @@ public static class ApiExtensions
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public static Task<IReadOnlyList<T>> GetAll<T>(this IApiConnection connection, Uri uri)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return connection.GetAll<T>(uri, ApiOptions.None);
         }
@@ -36,8 +36,8 @@ public static Task<IReadOnlyList<T>> GetAll<T>(this IApiConnection connection, U
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public static Task<string> GetHtml(this IApiConnection connection, Uri uri)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return connection.GetHtml(uri, null);
         }
@@ -50,8 +50,8 @@ public static Task<string> GetHtml(this IApiConnection connection, Uri uri)
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public static Task<IApiResponse<string>> GetHtml(this IConnection connection, Uri uri)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return connection.GetHtml(uri, null);
         }
@@ -66,8 +66,8 @@ public static Task<IApiResponse<string>> GetHtml(this IConnection connection, Ur
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public static Task<IApiResponse<T>> GetResponse<T>(this IConnection connection, Uri uri)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return connection.Get<T>(uri, null, null);
         }
@@ -83,8 +83,8 @@ public static Task<IApiResponse<T>> GetResponse<T>(this IConnection connection,
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public static Task<IApiResponse<T>> GetResponse<T>(this IConnection connection, Uri uri, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return connection.Get<T>(uri, null, null, cancellationToken);
         }
@@ -102,7 +102,7 @@ public static Task<IApiResponse<T>> GetResponse<T>(this IConnection connection,
         /// <returns></returns>
         public static bool IsTrue(this IResponse response)
         {
-            Ensure.ArgumentNotNull(response, "response");
+            Ensure.ArgumentNotNull(response, nameof(response));
 
             if (response.StatusCode != HttpStatusCode.NotFound && response.StatusCode != HttpStatusCode.NoContent)
             {
diff --git a/Octokit/Helpers/ApiUrls.cs b/Octokit/Helpers/ApiUrls.cs
index 880a84527a..2b5154f038 100644
--- a/Octokit/Helpers/ApiUrls.cs
+++ b/Octokit/Helpers/ApiUrls.cs
@@ -1825,10 +1825,10 @@ public static Uri RepositoryCommits(string owner, string name)
         /// <returns></returns>
         public static Uri RepoCompare(string owner, string name, string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(@base, nameof(@base));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             var encodedBase = @base.UriEncode();
             var encodedHead = head.UriEncode();
@@ -3080,8 +3080,8 @@ public static Uri RepoCollaborators(long repositoryId)
         /// <returns>The <see cref="Uri"/> for comparing two commits.</returns>
         public static Uri RepoCompare(long repositoryId, string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(@base, "base");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(@base, nameof(@base));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
             var encodedBase = @base.UriEncode();
             var encodedHead = head.UriEncode();
             return "repositories/{0}/compare/{1}...{2}".FormatUri(repositoryId, encodedBase, encodedHead);
diff --git a/Octokit/Helpers/CollectionExtensions.cs b/Octokit/Helpers/CollectionExtensions.cs
index e2e0c893c7..3e9e8e895e 100644
--- a/Octokit/Helpers/CollectionExtensions.cs
+++ b/Octokit/Helpers/CollectionExtensions.cs
@@ -8,7 +8,7 @@ internal static class CollectionExtensions
     {
         public static TValue SafeGet<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue> dictionary, TKey key)
         {
-            Ensure.ArgumentNotNull(dictionary, "dictionary");
+            Ensure.ArgumentNotNull(dictionary, nameof(dictionary));
 
             TValue value;
             return dictionary.TryGetValue(key, out value) ? value : default(TValue);
diff --git a/Octokit/Helpers/HttpClientExtensions.cs b/Octokit/Helpers/HttpClientExtensions.cs
index 7fbb656ef1..51b22c8fd9 100644
--- a/Octokit/Helpers/HttpClientExtensions.cs
+++ b/Octokit/Helpers/HttpClientExtensions.cs
@@ -8,8 +8,8 @@ public static class HttpClientExtensions
     {
         public static Task<IResponse> Send(this IHttpClient httpClient, IRequest request)
         {
-            Ensure.ArgumentNotNull(httpClient, "httpClient");
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(httpClient, nameof(httpClient));
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             return httpClient.Send(request, CancellationToken.None);
         }
diff --git a/Octokit/Helpers/ReferenceExtensions.cs b/Octokit/Helpers/ReferenceExtensions.cs
index b7220a9ae3..fe3917b664 100644
--- a/Octokit/Helpers/ReferenceExtensions.cs
+++ b/Octokit/Helpers/ReferenceExtensions.cs
@@ -19,10 +19,10 @@ public static class ReferenceExtensions
         /// <param name="baseReference">The <see cref="Reference" /> to base the branch from</param>
         public static async Task<Reference> CreateBranch(this IReferencesClient referencesClient, string owner, string name, string branchName, Reference baseReference)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branchName, "branchName");
-            Ensure.ArgumentNotNull(baseReference, "baseReference");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branchName, nameof(branchName));
+            Ensure.ArgumentNotNull(baseReference, nameof(baseReference));
 
             if (branchName.StartsWith("refs/heads"))
             {
@@ -42,9 +42,9 @@ public static async Task<Reference> CreateBranch(this IReferencesClient referenc
         /// <param name="branchName">The new branch name</param>
         public static async Task<Reference> CreateBranch(this IReferencesClient referencesClient, string owner, string name, string branchName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(branchName, "branchName");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(branchName, nameof(branchName));
 
             if (branchName.StartsWith("refs/heads"))
             {
diff --git a/Octokit/Helpers/StringExtensions.cs b/Octokit/Helpers/StringExtensions.cs
index 33ff24c4ef..a1cd0580bb 100644
--- a/Octokit/Helpers/StringExtensions.cs
+++ b/Octokit/Helpers/StringExtensions.cs
@@ -22,7 +22,7 @@ public static bool IsNotBlank(this string value)
 
         public static Uri FormatUri(this string pattern, params object[] args)
         {
-            Ensure.ArgumentNotNullOrEmptyString(pattern, "pattern");
+            Ensure.ArgumentNotNullOrEmptyString(pattern, nameof(pattern));
 
             return new Uri(string.Format(CultureInfo.InvariantCulture, pattern, args), UriKind.Relative);
         }
@@ -72,24 +72,24 @@ public static Uri ExpandUriTemplate(this string template, object values)
             Justification = "Ruby don't care. Ruby don't play that.")]
         public static string ToRubyCase(this string propertyName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(propertyName, "propertyName");
+            Ensure.ArgumentNotNullOrEmptyString(propertyName, nameof(propertyName));
             return string.Join("_", propertyName.SplitUpperCase()).ToLowerInvariant();
         }
 
         public static string FromRubyCase(this string propertyName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(propertyName, "propertyName");
+            Ensure.ArgumentNotNullOrEmptyString(propertyName, nameof(propertyName));
             return string.Join("", propertyName.Split('_')).ToCapitalizedInvariant();
         }
 
         public static string ToCapitalizedInvariant(this string value)
         {
-            Ensure.ArgumentNotNullOrEmptyString(value, "value");
+            Ensure.ArgumentNotNullOrEmptyString(value, nameof(value));
             return string.Concat(value[0].ToString().ToUpperInvariant(), value.Substring(1));
         }
         static IEnumerable<string> SplitUpperCase(this string source)
         {
-            Ensure.ArgumentNotNullOrEmptyString(source, "source");
+            Ensure.ArgumentNotNullOrEmptyString(source, nameof(source));
 
             int wordStartIndex = 0;
             var letters = source.ToCharArray();
diff --git a/Octokit/Helpers/TwoFactorChallengeResult.cs b/Octokit/Helpers/TwoFactorChallengeResult.cs
index b8bde49225..f0ba5ab90b 100644
--- a/Octokit/Helpers/TwoFactorChallengeResult.cs
+++ b/Octokit/Helpers/TwoFactorChallengeResult.cs
@@ -21,7 +21,7 @@ public class TwoFactorChallengeResult
         public TwoFactorChallengeResult(string authenticationCode)
             : this(authenticationCode, false)
         {
-            Ensure.ArgumentNotNull(authenticationCode, "authenticationCode");
+            Ensure.ArgumentNotNull(authenticationCode, nameof(authenticationCode));
         }
 
         TwoFactorChallengeResult(string authenticationCode, bool resendCodeRequested)
diff --git a/Octokit/Helpers/UriExtensions.cs b/Octokit/Helpers/UriExtensions.cs
index 7be15802ad..eb64239feb 100644
--- a/Octokit/Helpers/UriExtensions.cs
+++ b/Octokit/Helpers/UriExtensions.cs
@@ -41,7 +41,7 @@ public static Uri ReplaceRelativeUri(this Uri uri, Uri relativeUri)
         /// <returns>Updated request Uri</returns>
         public static Uri ApplyParameters(this Uri uri, IDictionary<string, string> parameters)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             if (parameters == null || !parameters.Any()) return uri;
 
diff --git a/Octokit/Http/ApiConnection.cs b/Octokit/Http/ApiConnection.cs
index 2c6194aaf5..9bb83f0668 100644
--- a/Octokit/Http/ApiConnection.cs
+++ b/Octokit/Http/ApiConnection.cs
@@ -31,8 +31,8 @@ public class ApiConnection : IApiConnection
         /// <param name="pagination">A paginator for paging API responses</param>
         protected ApiConnection(IConnection connection, IApiPagination pagination)
         {
-            Ensure.ArgumentNotNull(connection, "connection");
-            Ensure.ArgumentNotNull(pagination, "pagination");
+            Ensure.ArgumentNotNull(connection, nameof(connection));
+            Ensure.ArgumentNotNull(pagination, nameof(pagination));
 
             Connection = connection;
             _pagination = pagination;
@@ -52,7 +52,7 @@ protected ApiConnection(IConnection connection, IApiPagination pagination)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public Task<T> Get<T>(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Get<T>(uri, null);
         }
@@ -67,7 +67,7 @@ public Task<T> Get<T>(Uri uri)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Get<T>(Uri uri, IDictionary<string, string> parameters)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await Connection.Get<T>(uri, parameters, null).ConfigureAwait(false);
             return response.Body;
@@ -84,8 +84,8 @@ public async Task<T> Get<T>(Uri uri, IDictionary<string, string> parameters)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Get<T>(Uri uri, IDictionary<string, string> parameters, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             var response = await Connection.Get<T>(uri, parameters, accepts).ConfigureAwait(false);
             return response.Body;
@@ -100,7 +100,7 @@ public async Task<T> Get<T>(Uri uri, IDictionary<string, string> parameters, str
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<string> GetHtml(Uri uri, IDictionary<string, string> parameters)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await Connection.GetHtml(uri, parameters).ConfigureAwait(false);
             return response.Body;
@@ -182,15 +182,15 @@ public Task<IReadOnlyList<T>> GetAll<T>(Uri uri, IDictionary<string, string> par
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public Task<IReadOnlyList<T>> GetAll<T>(Uri uri, IDictionary<string, string> parameters, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return _pagination.GetAllPages(async () => await GetPage<T>(uri, parameters, accepts).ConfigureAwait(false), uri);
         }
 
         public Task<IReadOnlyList<T>> GetAll<T>(Uri uri, IDictionary<string, string> parameters, string accepts, ApiOptions options)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(options, "options");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(options, nameof(options));
 
             parameters = Pagination.Setup(parameters, options);
 
@@ -205,7 +205,7 @@ public Task<IReadOnlyList<T>> GetAll<T>(Uri uri, IDictionary<string, string> par
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public Task Post(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Connection.Post(uri);
         }
@@ -219,7 +219,7 @@ public Task Post(Uri uri)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Post<T>(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await Connection.Post<T>(uri).ConfigureAwait(false);
             return response.Body;
@@ -235,8 +235,8 @@ public async Task<T> Post<T>(Uri uri)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public Task<T> Post<T>(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return Post<T>(uri, data, null, null);
         }
@@ -267,8 +267,8 @@ public Task<T> Post<T>(Uri uri, object data, string accepts)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Post<T>(Uri uri, object data, string accepts, string contentType)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Post<T>(uri, data, accepts, contentType).ConfigureAwait(false);
             return response.Body;
@@ -287,9 +287,9 @@ public async Task<T> Post<T>(Uri uri, object data, string accepts, string conten
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Post<T>(Uri uri, object data, string accepts, string contentType, string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
-            Ensure.ArgumentNotNull(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
+            Ensure.ArgumentNotNull(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             var response = await Connection.Post<T>(uri, data, accepts, contentType, twoFactorAuthenticationCode).ConfigureAwait(false);
             return response.Body;
@@ -298,8 +298,8 @@ public async Task<T> Post<T>(Uri uri, object data, string accepts, string conten
 
         public async Task<T> Post<T>(Uri uri, object data, string accepts, string contentType, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Post<T>(uri, data, accepts, contentType, timeout).ConfigureAwait(false);
             return response.Body;
@@ -312,7 +312,7 @@ public async Task<T> Post<T>(Uri uri, object data, string accepts, string conten
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Put(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Connection.Put(uri);
         }
@@ -327,8 +327,8 @@ public Task Put(Uri uri)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Put<T>(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Put<T>(uri, data).ConfigureAwait(false);
 
@@ -346,9 +346,9 @@ public async Task<T> Put<T>(Uri uri, object data)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Put<T>(Uri uri, object data, string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             var response = await Connection.Put<T>(uri, data, twoFactorAuthenticationCode).ConfigureAwait(false);
 
@@ -367,8 +367,8 @@ public async Task<T> Put<T>(Uri uri, object data, string twoFactorAuthentication
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Put<T>(Uri uri, object data, string twoFactorAuthenticationCode, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Put<T>(uri, data, twoFactorAuthenticationCode, accepts).ConfigureAwait(false);
 
@@ -382,7 +382,7 @@ public async Task<T> Put<T>(Uri uri, object data, string twoFactorAuthentication
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Patch(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Connection.Patch(uri);
         }
@@ -395,8 +395,8 @@ public Task Patch(Uri uri)
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Patch(Uri uri, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             return Connection.Patch(uri, accepts);
         }
@@ -411,8 +411,8 @@ public Task Patch(Uri uri, string accepts)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Patch<T>(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Patch<T>(uri, data).ConfigureAwait(false);
 
@@ -430,9 +430,9 @@ public async Task<T> Patch<T>(Uri uri, object data)
         /// <exception cref="ApiException">Thrown when an API error occurs.</exception>
         public async Task<T> Patch<T>(Uri uri, object data, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             var response = await Connection.Patch<T>(uri, data, accepts).ConfigureAwait(false);
 
@@ -446,7 +446,7 @@ public async Task<T> Patch<T>(Uri uri, object data, string accepts)
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Delete(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Connection.Delete(uri);
         }
@@ -459,7 +459,7 @@ public Task Delete(Uri uri)
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Delete(Uri uri, string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return Connection.Delete(uri, twoFactorAuthenticationCode);
         }
@@ -472,8 +472,8 @@ public Task Delete(Uri uri, string twoFactorAuthenticationCode)
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         public Task Delete(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return Connection.Delete(uri, data);
         }
@@ -487,9 +487,9 @@ public Task Delete(Uri uri, object data)
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public Task Delete(Uri uri, object data, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             return Connection.Delete(uri, data, accepts);
         }
@@ -502,8 +502,8 @@ public Task Delete(Uri uri, object data, string accepts)
         /// <param name="data">The object to serialize as the body of the request</param>
         public async Task<T> Delete<T>(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var response = await Connection.Delete<T>(uri, data).ConfigureAwait(false);
 
@@ -520,9 +520,9 @@ public async Task<T> Delete<T>(Uri uri, object data)
         /// <param name="accepts">Specifies accept response media type</param>
         public async Task<T> Delete<T>(Uri uri, object data, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             var response = await Connection.Delete<T>(uri, data, accepts).ConfigureAwait(false);
 
@@ -544,7 +544,7 @@ public async Task<IReadOnlyList<T>> GetQueuedOperation<T>(Uri uri, CancellationT
         {
             while (true)
             {
-                Ensure.ArgumentNotNull(uri, "uri");
+                Ensure.ArgumentNotNull(uri, nameof(uri));
 
                 var response = await Connection.GetResponse<IReadOnlyList<T>>(uri, cancellationToken).ConfigureAwait(false);
 
@@ -568,7 +568,7 @@ async Task<IReadOnlyPagedCollection<T>> GetPage<T>(
             IDictionary<string, string> parameters,
             string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await Connection.Get<List<T>>(uri, parameters, accepts).ConfigureAwait(false);
             return new ReadOnlyPagedCollection<T>(
@@ -582,7 +582,7 @@ async Task<IReadOnlyPagedCollection<TU>> GetPage<TU>(
             string accepts,
             ApiOptions options)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var connection = Connection;
 
diff --git a/Octokit/Http/ApiInfo.cs b/Octokit/Http/ApiInfo.cs
index 8a7f12da47..fd194ab012 100644
--- a/Octokit/Http/ApiInfo.cs
+++ b/Octokit/Http/ApiInfo.cs
@@ -15,9 +15,9 @@ public ApiInfo(IDictionary<string, Uri> links,
             string etag,
             RateLimit rateLimit)
         {
-            Ensure.ArgumentNotNull(links, "links");
-            Ensure.ArgumentNotNull(oauthScopes, "oauthScopes");
-            Ensure.ArgumentNotNull(acceptedOauthScopes, "acceptedOauthScopes");
+            Ensure.ArgumentNotNull(links, nameof(links));
+            Ensure.ArgumentNotNull(oauthScopes, nameof(oauthScopes));
+            Ensure.ArgumentNotNull(acceptedOauthScopes, nameof(acceptedOauthScopes));
 
             Links = new ReadOnlyDictionary<string, Uri>(links);
             OauthScopes = new ReadOnlyCollection<string>(oauthScopes);
diff --git a/Octokit/Http/ApiInfoExtensions.cs b/Octokit/Http/ApiInfoExtensions.cs
index fb4ca88dc5..a25685d27f 100644
--- a/Octokit/Http/ApiInfoExtensions.cs
+++ b/Octokit/Http/ApiInfoExtensions.cs
@@ -6,28 +6,28 @@ public static class ApiInfoExtensions
     {
         public static Uri GetPreviousPageUrl(this ApiInfo info)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             return info.Links.SafeGet("prev");
         }
 
         public static Uri GetNextPageUrl(this ApiInfo info)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             return info.Links.SafeGet("next");
         }
 
         public static Uri GetFirstPageUrl(this ApiInfo info)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             return info.Links.SafeGet("first");
         }
 
         public static Uri GetLastPageUrl(this ApiInfo info)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             return info.Links.SafeGet("last");
         }
diff --git a/Octokit/Http/ApiInfoParser.cs b/Octokit/Http/ApiInfoParser.cs
index ca61e37495..94a51c5649 100644
--- a/Octokit/Http/ApiInfoParser.cs
+++ b/Octokit/Http/ApiInfoParser.cs
@@ -18,7 +18,7 @@ internal static class ApiInfoParser
 
         public static ApiInfo ParseResponseHeaders(IDictionary<string, string> responseHeaders)
         {
-            Ensure.ArgumentNotNull(responseHeaders, "responseHeaders");
+            Ensure.ArgumentNotNull(responseHeaders, nameof(responseHeaders));
 
             var httpLinks = new Dictionary<string, Uri>();
             var oauthScopes = new List<string>();
diff --git a/Octokit/Http/ApiResponse.cs b/Octokit/Http/ApiResponse.cs
index d677af0ca3..c7f8580d8f 100644
--- a/Octokit/Http/ApiResponse.cs
+++ b/Octokit/Http/ApiResponse.cs
@@ -21,7 +21,7 @@ public ApiResponse(IResponse response) : this(response, GetBodyAsObject(response
         /// <param name="bodyAsObject">The payload from an existing request</param>
         public ApiResponse(IResponse response, T bodyAsObject)
         {
-            Ensure.ArgumentNotNull(response, "response");
+            Ensure.ArgumentNotNull(response, nameof(response));
 
             HttpResponse = response;
             Body = bodyAsObject;
diff --git a/Octokit/Http/Connection.cs b/Octokit/Http/Connection.cs
index 871917234c..65fa107ea0 100644
--- a/Octokit/Http/Connection.cs
+++ b/Octokit/Http/Connection.cs
@@ -138,11 +138,11 @@ public Connection(
             IHttpClient httpClient,
             IJsonSerializer serializer)
         {
-            Ensure.ArgumentNotNull(productInformation, "productInformation");
-            Ensure.ArgumentNotNull(baseAddress, "baseAddress");
-            Ensure.ArgumentNotNull(credentialStore, "credentialStore");
-            Ensure.ArgumentNotNull(httpClient, "httpClient");
-            Ensure.ArgumentNotNull(serializer, "serializer");
+            Ensure.ArgumentNotNull(productInformation, nameof(productInformation));
+            Ensure.ArgumentNotNull(baseAddress, nameof(baseAddress));
+            Ensure.ArgumentNotNull(credentialStore, nameof(credentialStore));
+            Ensure.ArgumentNotNull(httpClient, nameof(httpClient));
+            Ensure.ArgumentNotNull(serializer, nameof(serializer));
 
             if (!baseAddress.IsAbsoluteUri)
             {
@@ -174,21 +174,21 @@ public ApiInfo GetLastApiInfo()
 
         public Task<IApiResponse<T>> Get<T>(Uri uri, IDictionary<string, string> parameters, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return SendData<T>(uri.ApplyParameters(parameters), HttpMethod.Get, null, accepts, null, CancellationToken.None);
         }
 
         public Task<IApiResponse<T>> Get<T>(Uri uri, IDictionary<string, string> parameters, string accepts, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return SendData<T>(uri.ApplyParameters(parameters), HttpMethod.Get, null, accepts, null, cancellationToken);
         }
 
         public Task<IApiResponse<T>> Get<T>(Uri uri, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return SendData<T>(uri, HttpMethod.Get, null, null, null, timeout, CancellationToken.None);
         }
@@ -201,7 +201,7 @@ public Task<IApiResponse<T>> Get<T>(Uri uri, TimeSpan timeout)
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public Task<IApiResponse<string>> GetHtml(Uri uri, IDictionary<string, string> parameters)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return GetHtml(new Request
             {
@@ -213,17 +213,17 @@ public Task<IApiResponse<string>> GetHtml(Uri uri, IDictionary<string, string> p
 
         public Task<IApiResponse<T>> Patch<T>(Uri uri, object body)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
 
             return SendData<T>(uri, HttpVerb.Patch, body, null, null, CancellationToken.None);
         }
 
         public Task<IApiResponse<T>> Patch<T>(Uri uri, object body, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             return SendData<T>(uri, HttpVerb.Patch, body, accepts, null, CancellationToken.None);
         }
@@ -235,7 +235,7 @@ public Task<IApiResponse<T>> Patch<T>(Uri uri, object body, string accepts)
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public async Task<HttpStatusCode> Post(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await SendData<object>(uri, HttpMethod.Post, null, null, null, CancellationToken.None).ConfigureAwait(false);
             return response.HttpResponse.StatusCode;
@@ -243,7 +243,7 @@ public async Task<HttpStatusCode> Post(Uri uri)
 
         public async Task<HttpStatusCode> Post(Uri uri, object body, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await SendData<object>(uri, HttpMethod.Post, body, accepts, null, CancellationToken.None).ConfigureAwait(false);
             return response.HttpResponse.StatusCode;
@@ -251,15 +251,15 @@ public async Task<HttpStatusCode> Post(Uri uri, object body, string accepts)
 
         public Task<IApiResponse<T>> Post<T>(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             return SendData<T>(uri, HttpMethod.Post, null, null, null, CancellationToken.None);
         }
 
         public Task<IApiResponse<T>> Post<T>(Uri uri, object body, string accepts, string contentType)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
 
             return SendData<T>(uri, HttpMethod.Post, body, accepts, contentType, CancellationToken.None);
         }
@@ -277,25 +277,25 @@ public Task<IApiResponse<T>> Post<T>(Uri uri, object body, string accepts, strin
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public Task<IApiResponse<T>> Post<T>(Uri uri, object body, string accepts, string contentType, string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
-            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, "twoFactorAuthenticationCode");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
+            Ensure.ArgumentNotNullOrEmptyString(twoFactorAuthenticationCode, nameof(twoFactorAuthenticationCode));
 
             return SendData<T>(uri, HttpMethod.Post, body, accepts, contentType, CancellationToken.None, twoFactorAuthenticationCode);
         }
 
         public Task<IApiResponse<T>> Post<T>(Uri uri, object body, string accepts, string contentType, TimeSpan timeout)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
 
             return SendData<T>(uri, HttpMethod.Post, body, accepts, contentType, timeout, CancellationToken.None);
         }
 
         public Task<IApiResponse<T>> Post<T>(Uri uri, object body, string accepts, string contentType, Uri baseAddress)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(body, "body");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(body, nameof(body));
 
             return SendData<T>(uri, HttpMethod.Post, body, accepts, contentType, CancellationToken.None, baseAddress: baseAddress);
         }
@@ -338,8 +338,8 @@ Task<IApiResponse<T>> SendData<T>(
             string twoFactorAuthenticationCode = null,
             Uri baseAddress = null)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.GreaterThanZero(timeout, "timeout");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.GreaterThanZero(timeout, nameof(timeout));
 
             var request = new Request
             {
@@ -362,7 +362,7 @@ Task<IApiResponse<T>> SendData<T>(
             string twoFactorAuthenticationCode = null,
             Uri baseAddress = null)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var request = new Request
             {
@@ -403,7 +403,7 @@ Task<IApiResponse<T>> SendDataInternal<T>(object body, string accepts, string co
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public async Task<HttpStatusCode> Patch(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var request = new Request
             {
@@ -423,8 +423,8 @@ public async Task<HttpStatusCode> Patch(Uri uri)
         /// <returns><seealso cref="IResponse"/> representing the received HTTP response</returns>
         public async Task<HttpStatusCode> Patch(Uri uri, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             var response = await SendData<object>(uri, new HttpMethod("PATCH"), null, accepts, null, CancellationToken.None).ConfigureAwait(false);
             return response.HttpResponse.StatusCode;
@@ -437,7 +437,7 @@ public async Task<HttpStatusCode> Patch(Uri uri, string accepts)
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public async Task<HttpStatusCode> Put(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var request = new Request
             {
@@ -471,7 +471,7 @@ public async Task<HttpStatusCode> Put(Uri uri, string accepts)
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public async Task<HttpStatusCode> Delete(Uri uri)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var request = new Request
             {
@@ -491,7 +491,7 @@ public async Task<HttpStatusCode> Delete(Uri uri)
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public async Task<HttpStatusCode> Delete(Uri uri, string twoFactorAuthenticationCode)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
 
             var response = await SendData<object>(uri, HttpMethod.Delete, null, null, null, CancellationToken.None, twoFactorAuthenticationCode).ConfigureAwait(false);
             return response.HttpResponse.StatusCode;
@@ -505,8 +505,8 @@ public async Task<HttpStatusCode> Delete(Uri uri, string twoFactorAuthentication
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public async Task<HttpStatusCode> Delete(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             var request = new Request
             {
@@ -528,8 +528,8 @@ public async Task<HttpStatusCode> Delete(Uri uri, object data)
         /// <returns>The returned <seealso cref="HttpStatusCode"/></returns>
         public async Task<HttpStatusCode> Delete(Uri uri, object data, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             var response = await SendData<object>(uri, HttpMethod.Delete, data, accepts, null, CancellationToken.None).ConfigureAwait(false);
             return response.HttpResponse.StatusCode;
@@ -543,8 +543,8 @@ public async Task<HttpStatusCode> Delete(Uri uri, object data, string accepts)
         /// <param name="data">The object to serialize as the body of the request</param>
         public Task<IApiResponse<T>> Delete<T>(Uri uri, object data)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(data, "data");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(data, nameof(data));
 
             return SendData<T>(uri, HttpMethod.Delete, data, null, null, CancellationToken.None);
         }
@@ -559,8 +559,8 @@ public Task<IApiResponse<T>> Delete<T>(Uri uri, object data)
         /// <param name="accepts">Specifies accept response media type</param>
         public Task<IApiResponse<T>> Delete<T>(Uri uri, object data, string accepts)
         {
-            Ensure.ArgumentNotNull(uri, "uri");
-            Ensure.ArgumentNotNull(accepts, "accepts");
+            Ensure.ArgumentNotNull(uri, nameof(uri));
+            Ensure.ArgumentNotNull(accepts, nameof(accepts));
 
             return SendData<T>(uri, HttpMethod.Delete, data, accepts, null, CancellationToken.None);
         }
@@ -600,7 +600,7 @@ public Credentials Credentials
             // Note this is for convenience. We probably shouldn't allow this to be mutable.
             set
             {
-                Ensure.ArgumentNotNull(value, "value");
+                Ensure.ArgumentNotNull(value, nameof(value));
                 _authenticator.CredentialStore = new InMemoryCredentialStore(value);
             }
         }
diff --git a/Octokit/Http/Credentials.cs b/Octokit/Http/Credentials.cs
index f62efa6316..dbf014a121 100644
--- a/Octokit/Http/Credentials.cs
+++ b/Octokit/Http/Credentials.cs
@@ -15,7 +15,7 @@ private Credentials()
 
         public Credentials(string token)
         {
-            Ensure.ArgumentNotNullOrEmptyString(token, "token");
+            Ensure.ArgumentNotNullOrEmptyString(token, nameof(token));
 
             Login = null;
             Password = token;
@@ -24,8 +24,8 @@ public Credentials(string token)
 
         public Credentials(string login, string password)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNullOrEmptyString(password, "password");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNullOrEmptyString(password, nameof(password));
 
             Login = login;
             Password = password;
diff --git a/Octokit/Http/CredentialsExtensions.cs b/Octokit/Http/CredentialsExtensions.cs
index 14dbe2263a..8ef028cbd0 100644
--- a/Octokit/Http/CredentialsExtensions.cs
+++ b/Octokit/Http/CredentialsExtensions.cs
@@ -4,7 +4,7 @@ public static class CredentialsExtensions
     {
         public static string GetToken(this Credentials credentials)
         {
-            Ensure.ArgumentNotNull(credentials, "credentials");
+            Ensure.ArgumentNotNull(credentials, nameof(credentials));
 
             return credentials.Password;
         }
diff --git a/Octokit/Http/HttpClientAdapter.cs b/Octokit/Http/HttpClientAdapter.cs
index 0050aae34b..873ab75272 100644
--- a/Octokit/Http/HttpClientAdapter.cs
+++ b/Octokit/Http/HttpClientAdapter.cs
@@ -25,7 +25,7 @@ public class HttpClientAdapter : IHttpClient
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
         public HttpClientAdapter(Func<HttpMessageHandler> getHandler)
         {
-            Ensure.ArgumentNotNull(getHandler, "getHandler");
+            Ensure.ArgumentNotNull(getHandler, nameof(getHandler));
 
 #if HAS_SERVICEPOINTMANAGER
             ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
@@ -42,7 +42,7 @@ public HttpClientAdapter(Func<HttpMessageHandler> getHandler)
         /// <returns>A <see cref="Task" /> of <see cref="IResponse"/></returns>
         public async Task<IResponse> Send(IRequest request, CancellationToken cancellationToken)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             var cancellationTokenForRequest = GetCancellationTokenForRequest(request, cancellationToken);
 
@@ -71,7 +71,7 @@ static CancellationToken GetCancellationTokenForRequest(IRequest request, Cancel
 
         protected virtual async Task<IResponse> BuildResponse(HttpResponseMessage responseMessage)
         {
-            Ensure.ArgumentNotNull(responseMessage, "responseMessage");
+            Ensure.ArgumentNotNull(responseMessage, nameof(responseMessage));
 
             object responseBody = null;
             string contentType = null;
@@ -110,7 +110,7 @@ protected virtual async Task<IResponse> BuildResponse(HttpResponseMessage respon
 
         protected virtual HttpRequestMessage BuildRequestMessage(IRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
             HttpRequestMessage requestMessage = null;
             try
             {
diff --git a/Octokit/Http/InMemoryCredentialStore.cs b/Octokit/Http/InMemoryCredentialStore.cs
index 04ceec9eff..2e08a8b2a5 100644
--- a/Octokit/Http/InMemoryCredentialStore.cs
+++ b/Octokit/Http/InMemoryCredentialStore.cs
@@ -15,7 +15,7 @@ public class InMemoryCredentialStore : ICredentialStore
         /// <param name="credentials"></param>
         public InMemoryCredentialStore(Credentials credentials)
         {
-            Ensure.ArgumentNotNull(credentials, "credentials");
+            Ensure.ArgumentNotNull(credentials, nameof(credentials));
 
             _credentials = credentials;
         }
diff --git a/Octokit/Http/JsonHttpPipeline.cs b/Octokit/Http/JsonHttpPipeline.cs
index abc8dfa590..81548df58f 100644
--- a/Octokit/Http/JsonHttpPipeline.cs
+++ b/Octokit/Http/JsonHttpPipeline.cs
@@ -19,14 +19,14 @@ public JsonHttpPipeline() : this(new SimpleJsonSerializer())
 
         public JsonHttpPipeline(IJsonSerializer serializer)
         {
-            Ensure.ArgumentNotNull(serializer, "serializer");
+            Ensure.ArgumentNotNull(serializer, nameof(serializer));
 
             _serializer = serializer;
         }
 
         public void SerializeRequest(IRequest request)
         {
-            Ensure.ArgumentNotNull(request, "request");
+            Ensure.ArgumentNotNull(request, nameof(request));
 
             if (!request.Headers.ContainsKey("Accept"))
             {
@@ -41,7 +41,7 @@ public void SerializeRequest(IRequest request)
 
         public IApiResponse<T> DeserializeResponse<T>(IResponse response)
         {
-            Ensure.ArgumentNotNull(response, "response");
+            Ensure.ArgumentNotNull(response, nameof(response));
 
             if (response.ContentType != null && response.ContentType.Equals("application/json", StringComparison.Ordinal))
             {
diff --git a/Octokit/Http/RateLimit.cs b/Octokit/Http/RateLimit.cs
index 2f1259bc1a..a2251b17fb 100644
--- a/Octokit/Http/RateLimit.cs
+++ b/Octokit/Http/RateLimit.cs
@@ -25,7 +25,7 @@ public RateLimit() { }
 
         public RateLimit(IDictionary<string, string> responseHeaders)
         {
-            Ensure.ArgumentNotNull(responseHeaders, "responseHeaders");
+            Ensure.ArgumentNotNull(responseHeaders, nameof(responseHeaders));
 
             Limit = (int)GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Limit");
             Remaining = (int)GetHeaderValueAsInt32Safe(responseHeaders, "X-RateLimit-Remaining");
@@ -34,9 +34,9 @@ public RateLimit(IDictionary<string, string> responseHeaders)
 
         public RateLimit(int limit, int remaining, long reset)
         {
-            Ensure.ArgumentNotNull(limit, "limit");
-            Ensure.ArgumentNotNull(remaining, "remaining");
-            Ensure.ArgumentNotNull(reset, "reset");
+            Ensure.ArgumentNotNull(limit, nameof(limit));
+            Ensure.ArgumentNotNull(remaining, nameof(remaining));
+            Ensure.ArgumentNotNull(reset, nameof(reset));
 
             Limit = limit;
             Remaining = remaining;
@@ -78,7 +78,7 @@ static long GetHeaderValueAsInt32Safe(IDictionary<string, string> responseHeader
 #if !NO_SERIALIZABLE
         protected RateLimit(SerializationInfo info, StreamingContext context)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             Limit = info.GetInt32("Limit");
             Remaining = info.GetInt32("Remaining");
@@ -88,7 +88,7 @@ protected RateLimit(SerializationInfo info, StreamingContext context)
         [SecurityCritical]
         public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
         {
-            Ensure.ArgumentNotNull(info, "info");
+            Ensure.ArgumentNotNull(info, nameof(info));
 
             info.AddValue("Limit", Limit);
             info.AddValue("Remaining", Remaining);
diff --git a/Octokit/Http/ReadOnlyPagedCollection.cs b/Octokit/Http/ReadOnlyPagedCollection.cs
index 520f107b33..c75c76b28b 100644
--- a/Octokit/Http/ReadOnlyPagedCollection.cs
+++ b/Octokit/Http/ReadOnlyPagedCollection.cs
@@ -13,8 +13,8 @@ public class ReadOnlyPagedCollection<T> : ReadOnlyCollection<T>, IReadOnlyPagedC
         public ReadOnlyPagedCollection(IApiResponse<List<T>> response, Func<Uri, Task<IApiResponse<List<T>>>> nextPageFunc)
             : base(response != null ? response.Body ?? new List<T>() : new List<T>())
         {
-            Ensure.ArgumentNotNull(response, "response");
-            Ensure.ArgumentNotNull(nextPageFunc, "nextPageFunc");
+            Ensure.ArgumentNotNull(response, nameof(response));
+            Ensure.ArgumentNotNull(nextPageFunc, nameof(nextPageFunc));
 
             _nextPageFunc = nextPageFunc;
             if (response != null)
diff --git a/Octokit/Http/Response.cs b/Octokit/Http/Response.cs
index c143cdddc7..41ff9d537b 100644
--- a/Octokit/Http/Response.cs
+++ b/Octokit/Http/Response.cs
@@ -15,7 +15,7 @@ public Response() : this(new Dictionary<string, string>())
 
         public Response(IDictionary<string, string> headers)
         {
-            Ensure.ArgumentNotNull(headers, "headers");
+            Ensure.ArgumentNotNull(headers, nameof(headers));
 
             Headers = new ReadOnlyDictionary<string, string>(headers);
             ApiInfo = ApiInfoParser.ParseResponseHeaders(headers);
@@ -23,7 +23,7 @@ public Response(IDictionary<string, string> headers)
 
         public Response(HttpStatusCode statusCode, object body, IDictionary<string, string> headers, string contentType)
         {
-            Ensure.ArgumentNotNull(headers, "headers");
+            Ensure.ArgumentNotNull(headers, nameof(headers));
 
             StatusCode = statusCode;
             Body = body;
diff --git a/Octokit/Http/SimpleJsonSerializer.cs b/Octokit/Http/SimpleJsonSerializer.cs
index e85ff70d99..0d0395a092 100644
--- a/Octokit/Http/SimpleJsonSerializer.cs
+++ b/Octokit/Http/SimpleJsonSerializer.cs
@@ -63,7 +63,7 @@ protected override string MapClrMemberToJsonFieldName(MemberInfo member)
             [SuppressMessage("Microsoft.Design", "CA1007:UseGenericsWhereAppropriate", Justification = "Need to support .NET 2")]
             protected override bool TrySerializeUnknownTypes(object input, out object output)
             {
-                Ensure.ArgumentNotNull(input, "input");
+                Ensure.ArgumentNotNull(input, nameof(input));
 
                 var type = input.GetType();
                 var getters = GetCache[type];
diff --git a/Octokit/Models/Request/BaseSearchRequest.cs b/Octokit/Models/Request/BaseSearchRequest.cs
index 7ff689def8..48ccf2586b 100644
--- a/Octokit/Models/Request/BaseSearchRequest.cs
+++ b/Octokit/Models/Request/BaseSearchRequest.cs
@@ -26,7 +26,7 @@ protected BaseSearchRequest()
         /// <param name="term">The term.</param>
         protected BaseSearchRequest(string term) : this()
         {
-            Ensure.ArgumentNotNullOrEmptyString(term, "term");
+            Ensure.ArgumentNotNullOrEmptyString(term, nameof(term));
             Term = term;
         }
 
diff --git a/Octokit/Models/Request/BranchProtectionUpdate.cs b/Octokit/Models/Request/BranchProtectionUpdate.cs
index 1d7181f66d..d0bed57070 100644
--- a/Octokit/Models/Request/BranchProtectionUpdate.cs
+++ b/Octokit/Models/Request/BranchProtectionUpdate.cs
@@ -202,7 +202,7 @@ public BranchProtectionPushRestrictionsUpdate()
         /// <param name="teams">Teams allowed to push to this branch</param>
         public BranchProtectionPushRestrictionsUpdate(BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             Teams = teams;
             Users = new BranchProtectionUserCollection();
@@ -214,7 +214,7 @@ public BranchProtectionPushRestrictionsUpdate(BranchProtectionTeamCollection tea
         /// <param name="users">Users allowed to push to this branch</param>
         public BranchProtectionPushRestrictionsUpdate(BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             Teams = new BranchProtectionTeamCollection();
             Users = users;
@@ -227,8 +227,8 @@ public BranchProtectionPushRestrictionsUpdate(BranchProtectionUserCollection use
         /// <param name="users">Users allowed to push to this branch</param>
         public BranchProtectionPushRestrictionsUpdate(BranchProtectionTeamCollection teams, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNull(teams, "teams");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(teams, nameof(teams));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             Teams = teams;
             Users = users;
@@ -383,7 +383,7 @@ public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(bool enabled)
         /// <param name="teams">Teams allowed to dismiss reviews</param>
         public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(BranchProtectionTeamCollection teams)
         {
-            Ensure.ArgumentNotNull(teams, "teams");
+            Ensure.ArgumentNotNull(teams, nameof(teams));
 
             Teams = teams;
             Users = new BranchProtectionUserCollection();
@@ -395,7 +395,7 @@ public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(BranchProtecti
         /// <param name="users">Users allowed to dismiss reviews</param>
         public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             Teams = new BranchProtectionTeamCollection();
             Users = users;
@@ -408,8 +408,8 @@ public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(BranchProtecti
         /// <param name="users">Users allowed to dismiss reviews</param>
         public BranchProtectionRequiredReviewsDismissalRestrictionsUpdate(BranchProtectionTeamCollection teams, BranchProtectionUserCollection users)
         {
-            Ensure.ArgumentNotNull(teams, "teams");
-            Ensure.ArgumentNotNull(users, "users");
+            Ensure.ArgumentNotNull(teams, nameof(teams));
+            Ensure.ArgumentNotNull(users, nameof(users));
 
             Teams = teams;
             Users = users;
diff --git a/Octokit/Models/Request/CreateFileRequest.cs b/Octokit/Models/Request/CreateFileRequest.cs
index 06d6f5e133..390fe564cc 100644
--- a/Octokit/Models/Request/CreateFileRequest.cs
+++ b/Octokit/Models/Request/CreateFileRequest.cs
@@ -15,7 +15,7 @@ public abstract class ContentRequest
         /// <param name="message">The message.</param>
         protected ContentRequest(string message)
         {
-            Ensure.ArgumentNotNullOrEmptyString(message, "message");
+            Ensure.ArgumentNotNullOrEmptyString(message, nameof(message));
 
             Message = message;
         }
@@ -27,7 +27,7 @@ protected ContentRequest(string message)
         /// <param name="branch">The branch the request is for.</param>
         protected ContentRequest(string message, string branch) : this(message)
         {
-            Ensure.ArgumentNotNullOrEmptyString(branch, "branch");
+            Ensure.ArgumentNotNullOrEmptyString(branch, nameof(branch));
 
             Branch = branch;
         }
@@ -66,7 +66,7 @@ public class DeleteFileRequest : ContentRequest
         /// <param name="sha">The sha.</param>
         public DeleteFileRequest(string message, string sha) : base(message)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Sha = sha;
         }
@@ -79,7 +79,7 @@ public DeleteFileRequest(string message, string sha) : base(message)
         /// <param name="branch">The branch the request is for.</param>
         public DeleteFileRequest(string message, string sha, string branch) : base(message, branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Sha = sha;
         }
@@ -127,7 +127,7 @@ public CreateFileRequest(string message, string content, string branch) : this(m
         /// <param name="convertContentToBase64">True to convert content to base64.</param>
         public CreateFileRequest(string message, string content, bool convertContentToBase64) : base(message)
         {
-            Ensure.ArgumentNotNull(content, "content");
+            Ensure.ArgumentNotNull(content, nameof(content));
 
             if (convertContentToBase64)
             {
@@ -145,7 +145,7 @@ public CreateFileRequest(string message, string content, bool convertContentToBa
         /// <param name="convertContentToBase64">True to convert content to base64.</param>
         public CreateFileRequest(string message, string content, string branch, bool convertContentToBase64) : base(message, branch)
         {
-            Ensure.ArgumentNotNullOrEmptyString(content, "content");
+            Ensure.ArgumentNotNullOrEmptyString(content, nameof(content));
 
             if (convertContentToBase64)
             {
@@ -205,7 +205,7 @@ public UpdateFileRequest(string message, string content, string sha, string bran
         public UpdateFileRequest(string message, string content, string sha, bool convertContentToBase64)
             : base(message, content, convertContentToBase64)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Sha = sha;
         }
@@ -221,7 +221,7 @@ public UpdateFileRequest(string message, string content, string sha, bool conver
         public UpdateFileRequest(string message, string content, string sha, string branch, bool convertContentToBase64)
            : base(message, content, branch, convertContentToBase64)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Sha = sha;
         }
diff --git a/Octokit/Models/Request/DraftPullRequestReviewComment.cs b/Octokit/Models/Request/DraftPullRequestReviewComment.cs
index 26a84e1b93..9a2957c625 100644
--- a/Octokit/Models/Request/DraftPullRequestReviewComment.cs
+++ b/Octokit/Models/Request/DraftPullRequestReviewComment.cs
@@ -17,8 +17,8 @@ public class DraftPullRequestReviewComment : RequestParameters
         /// <param name="position">The line index in the diff to comment on</param>
         public DraftPullRequestReviewComment(string body, string path, int position)
         {
-            Ensure.ArgumentNotNullOrEmptyString(body, "body");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(body, nameof(body));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             Body = body;
             Path = path;
diff --git a/Octokit/Models/Request/Enterprise/NewLdapMapping.cs b/Octokit/Models/Request/Enterprise/NewLdapMapping.cs
index 7076e73e3e..a2c332006d 100644
--- a/Octokit/Models/Request/Enterprise/NewLdapMapping.cs
+++ b/Octokit/Models/Request/Enterprise/NewLdapMapping.cs
@@ -16,7 +16,7 @@ public class NewLdapMapping
         /// <param name="ldapDistinguishedName">The LDAP Distinguished Name</param>
         public NewLdapMapping(string ldapDistinguishedName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(ldapDistinguishedName, "ldapDistinguishedName");
+            Ensure.ArgumentNotNullOrEmptyString(ldapDistinguishedName, nameof(ldapDistinguishedName));
 
             LdapDistinguishedName = ldapDistinguishedName;
         }
diff --git a/Octokit/Models/Request/LabelUpdate.cs b/Octokit/Models/Request/LabelUpdate.cs
index 811cace757..bcfbbfe151 100644
--- a/Octokit/Models/Request/LabelUpdate.cs
+++ b/Octokit/Models/Request/LabelUpdate.cs
@@ -20,8 +20,8 @@ public class LabelUpdate
         /// <param name="color">The color of the label.</param>
         public LabelUpdate(string name, string color)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(color, "color");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(color, nameof(color));
 
             Name = name;
             Color = color;
diff --git a/Octokit/Models/Request/NewCommitComment.cs b/Octokit/Models/Request/NewCommitComment.cs
index 131b964904..c3c7bae37e 100644
--- a/Octokit/Models/Request/NewCommitComment.cs
+++ b/Octokit/Models/Request/NewCommitComment.cs
@@ -15,7 +15,7 @@ public class NewCommitComment
         /// <param name="body">The body of the comment.</param>
         public NewCommitComment(string body)
         {
-            Ensure.ArgumentNotNull(body, "body");
+            Ensure.ArgumentNotNull(body, nameof(body));
 
             Body = body;
         }
diff --git a/Octokit/Models/Request/NewGpgKey.cs b/Octokit/Models/Request/NewGpgKey.cs
index 13d4773619..a41ce444ae 100644
--- a/Octokit/Models/Request/NewGpgKey.cs
+++ b/Octokit/Models/Request/NewGpgKey.cs
@@ -19,7 +19,7 @@ public NewGpgKey()
 
         public NewGpgKey(string publicKey)
         {
-            Ensure.ArgumentNotNullOrEmptyString(publicKey, "publicKey");
+            Ensure.ArgumentNotNullOrEmptyString(publicKey, nameof(publicKey));
 
             ArmoredPublicKey = publicKey;
         }
diff --git a/Octokit/Models/Request/NewLabel.cs b/Octokit/Models/Request/NewLabel.cs
index 3ee20f75c1..2f6e596e26 100644
--- a/Octokit/Models/Request/NewLabel.cs
+++ b/Octokit/Models/Request/NewLabel.cs
@@ -20,8 +20,8 @@ public class NewLabel
         /// <param name="color">The color of the label.</param>
         public NewLabel(string name, string color)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(color, "color");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(color, nameof(color));
 
             Name = name;
             Color = color;
diff --git a/Octokit/Models/Request/NewMerge.cs b/Octokit/Models/Request/NewMerge.cs
index e0e234351b..830b8c26f9 100644
--- a/Octokit/Models/Request/NewMerge.cs
+++ b/Octokit/Models/Request/NewMerge.cs
@@ -25,8 +25,8 @@ public class NewMerge
         /// <param name="head">The head to merge. This can be a branch name or a commit SHA1.</param>
         public NewMerge(string @base, string head)
         {
-            Ensure.ArgumentNotNullOrEmptyString(@base, "baseBranch");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
+            Ensure.ArgumentNotNullOrEmptyString(@base, nameof(@base));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
 
             Base = @base;
             Head = head;
diff --git a/Octokit/Models/Request/NewMilestone.cs b/Octokit/Models/Request/NewMilestone.cs
index 4817fa3a84..74092701d1 100644
--- a/Octokit/Models/Request/NewMilestone.cs
+++ b/Octokit/Models/Request/NewMilestone.cs
@@ -16,7 +16,7 @@ public class NewMilestone
         /// <param name="title">The title.</param>
         public NewMilestone(string title)
         {
-            Ensure.ArgumentNotNull(title, "title");
+            Ensure.ArgumentNotNull(title, nameof(title));
 
             Title = title;
             State = ItemState.Open;
diff --git a/Octokit/Models/Request/NewPublicKey.cs b/Octokit/Models/Request/NewPublicKey.cs
index 5faf2f8c43..47c44e7e07 100644
--- a/Octokit/Models/Request/NewPublicKey.cs
+++ b/Octokit/Models/Request/NewPublicKey.cs
@@ -14,8 +14,8 @@ public NewPublicKey()
 
         public NewPublicKey(string title, string key)
         {
-            Ensure.ArgumentNotNullOrEmptyString(title, "title");
-            Ensure.ArgumentNotNullOrEmptyString(key, "key");
+            Ensure.ArgumentNotNullOrEmptyString(title, nameof(title));
+            Ensure.ArgumentNotNullOrEmptyString(key, nameof(key));
 
             Title = title;
             Key = key;
diff --git a/Octokit/Models/Request/NewPullRequest.cs b/Octokit/Models/Request/NewPullRequest.cs
index e4323ba804..036772513e 100644
--- a/Octokit/Models/Request/NewPullRequest.cs
+++ b/Octokit/Models/Request/NewPullRequest.cs
@@ -17,9 +17,9 @@ public class NewPullRequest
         /// <param name="baseRef">The base (or git ref) reference you want your changes pulled into. In other words, the target branch/ref</param>
         public NewPullRequest(string title, string head, string baseRef)
         {
-            Ensure.ArgumentNotNullOrEmptyString(title, "title");
-            Ensure.ArgumentNotNullOrEmptyString(head, "head");
-            Ensure.ArgumentNotNullOrEmptyString(baseRef, "baseRef");
+            Ensure.ArgumentNotNullOrEmptyString(title, nameof(title));
+            Ensure.ArgumentNotNullOrEmptyString(head, nameof(head));
+            Ensure.ArgumentNotNullOrEmptyString(baseRef, nameof(baseRef));
 
             Title = title;
             Head = head;
diff --git a/Octokit/Models/Request/NewReference.cs b/Octokit/Models/Request/NewReference.cs
index 12630da08d..95212076cb 100644
--- a/Octokit/Models/Request/NewReference.cs
+++ b/Octokit/Models/Request/NewReference.cs
@@ -24,8 +24,8 @@ public class NewReference
         /// <param name="sha">The SHA1 value to set this reference to</param>
         public NewReference(string reference, string sha)
         {
-            Ensure.ArgumentNotNullOrEmptyString(reference, "reference");
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Ref = GetReference(reference);
             Sha = sha;
diff --git a/Octokit/Models/Request/NewRelease.cs b/Octokit/Models/Request/NewRelease.cs
index 6aa16d3b6f..fee5fe135d 100644
--- a/Octokit/Models/Request/NewRelease.cs
+++ b/Octokit/Models/Request/NewRelease.cs
@@ -18,7 +18,7 @@ public class NewRelease
         /// <param name="tagName">Name of the tag to create in the repository for this release.</param>
         public NewRelease(string tagName)
         {
-            Ensure.ArgumentNotNullOrEmptyString(tagName, "tagName");
+            Ensure.ArgumentNotNullOrEmptyString(tagName, nameof(tagName));
             TagName = tagName;
         }
 
diff --git a/Octokit/Models/Request/NewRepository.cs b/Octokit/Models/Request/NewRepository.cs
index 7d09ead6c0..15ac1d7700 100644
--- a/Octokit/Models/Request/NewRepository.cs
+++ b/Octokit/Models/Request/NewRepository.cs
@@ -16,7 +16,7 @@ public class NewRepository
         /// <param name="name">The name of the repository. This is the only required parameter.</param>
         public NewRepository(string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             Name = name;
         }
diff --git a/Octokit/Models/Request/NewRepositoryWebHook.cs b/Octokit/Models/Request/NewRepositoryWebHook.cs
index 14d009ccb6..aa0a6cf112 100644
--- a/Octokit/Models/Request/NewRepositoryWebHook.cs
+++ b/Octokit/Models/Request/NewRepositoryWebHook.cs
@@ -65,7 +65,7 @@ public class NewRepositoryWebHook : NewRepositoryHook
         public NewRepositoryWebHook(string name, IReadOnlyDictionary<string, string> config, string url)
             : base(name, config)
         {
-            Ensure.ArgumentNotNullOrEmptyString(url, "url");
+            Ensure.ArgumentNotNullOrEmptyString(url, nameof(url));
 
             Url = url;
             ContentType = WebHookContentType.Form;
diff --git a/Octokit/Models/Request/NewUser.cs b/Octokit/Models/Request/NewUser.cs
index 369f00f887..39ad34e288 100644
--- a/Octokit/Models/Request/NewUser.cs
+++ b/Octokit/Models/Request/NewUser.cs
@@ -18,8 +18,8 @@ public NewUser() { }
         /// <param name="email">The email address of the user</param>
         public NewUser(string login, string email)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
-            Ensure.ArgumentNotNullOrEmptyString(email, "email");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
+            Ensure.ArgumentNotNullOrEmptyString(email, nameof(email));
 
             Login = login;
             Email = email;
diff --git a/Octokit/Models/Request/OauthLoginRequest.cs b/Octokit/Models/Request/OauthLoginRequest.cs
index d643b60d32..54fe1911f7 100644
--- a/Octokit/Models/Request/OauthLoginRequest.cs
+++ b/Octokit/Models/Request/OauthLoginRequest.cs
@@ -18,7 +18,7 @@ public class OauthLoginRequest : RequestParameters
         /// <param name="clientId">The client Id you received from GitHub when you registered the application.</param>
         public OauthLoginRequest(string clientId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
 
             ClientId = clientId;
             Scopes = new Collection<string>();
diff --git a/Octokit/Models/Request/OauthTokenRequest.cs b/Octokit/Models/Request/OauthTokenRequest.cs
index d9b90c803e..583f944b2b 100644
--- a/Octokit/Models/Request/OauthTokenRequest.cs
+++ b/Octokit/Models/Request/OauthTokenRequest.cs
@@ -19,9 +19,9 @@ public class OauthTokenRequest : RequestParameters
         /// <param name="code">The code you received as a response to making the OAuth login request</param>
         public OauthTokenRequest(string clientId, string clientSecret, string code)
         {
-            Ensure.ArgumentNotNullOrEmptyString(clientId, "clientId");
-            Ensure.ArgumentNotNullOrEmptyString(clientSecret, "clientSecret");
-            Ensure.ArgumentNotNullOrEmptyString(code, "code");
+            Ensure.ArgumentNotNullOrEmptyString(clientId, nameof(clientId));
+            Ensure.ArgumentNotNullOrEmptyString(clientSecret, nameof(clientSecret));
+            Ensure.ArgumentNotNullOrEmptyString(code, nameof(code));
 
             ClientId = clientId;
             ClientSecret = clientSecret;
diff --git a/Octokit/Models/Request/OrganizationRequest.cs b/Octokit/Models/Request/OrganizationRequest.cs
index 3743fe1128..7b51898b0d 100644
--- a/Octokit/Models/Request/OrganizationRequest.cs
+++ b/Octokit/Models/Request/OrganizationRequest.cs
@@ -15,7 +15,7 @@ public class OrganizationRequest : RequestParameters
         /// <param name="since">The integer Id of the last Organization that you've seen.</param>
         public OrganizationRequest(int since)
         {
-            Ensure.ArgumentNotNull(since, "since");
+            Ensure.ArgumentNotNull(since, nameof(since));
 
             Since = since;
         }
diff --git a/Octokit/Models/Request/ProjectCardMove.cs b/Octokit/Models/Request/ProjectCardMove.cs
index 90496e7ae4..040bfd3617 100644
--- a/Octokit/Models/Request/ProjectCardMove.cs
+++ b/Octokit/Models/Request/ProjectCardMove.cs
@@ -18,7 +18,7 @@ public ProjectCardMove(ProjectCardPosition position, int columnId, int? cardId)
                     Position = "bottom";
                     break;
                 case ProjectCardPosition.After:
-                    Ensure.ArgumentNotNull(cardId, "cardId");
+                    Ensure.ArgumentNotNull(cardId, nameof(cardId));
                     Position = string.Format(CultureInfo.InvariantCulture, "after:{0}", cardId);
                     break;
             }
diff --git a/Octokit/Models/Request/ProjectColumnMove.cs b/Octokit/Models/Request/ProjectColumnMove.cs
index 23bddce810..ab60033f82 100644
--- a/Octokit/Models/Request/ProjectColumnMove.cs
+++ b/Octokit/Models/Request/ProjectColumnMove.cs
@@ -11,7 +11,7 @@ public ProjectColumnMove(ProjectColumnPosition position, int? columnId)
             switch (position)
             {
                 case ProjectColumnPosition.After:
-                    Ensure.ArgumentNotNull(columnId, "columnId");
+                    Ensure.ArgumentNotNull(columnId, nameof(columnId));
                     Position = string.Format(CultureInfo.InvariantCulture, "after:{0}", columnId);
                     break;
                 case ProjectColumnPosition.First:
diff --git a/Octokit/Models/Request/PullRequestReviewCommentCreate.cs b/Octokit/Models/Request/PullRequestReviewCommentCreate.cs
index b1e104c752..65d7011531 100644
--- a/Octokit/Models/Request/PullRequestReviewCommentCreate.cs
+++ b/Octokit/Models/Request/PullRequestReviewCommentCreate.cs
@@ -18,9 +18,9 @@ public class PullRequestReviewCommentCreate : RequestParameters
         /// <param name="position">The line index in the diff to comment on</param>
         public PullRequestReviewCommentCreate(string body, string commitId, string path, int position)
         {
-            Ensure.ArgumentNotNullOrEmptyString(body, "body");
-            Ensure.ArgumentNotNullOrEmptyString(commitId, "commitId");
-            Ensure.ArgumentNotNullOrEmptyString(path, "path");
+            Ensure.ArgumentNotNullOrEmptyString(body, nameof(body));
+            Ensure.ArgumentNotNullOrEmptyString(commitId, nameof(commitId));
+            Ensure.ArgumentNotNullOrEmptyString(path, nameof(path));
 
             Body = body;
             CommitId = commitId;
diff --git a/Octokit/Models/Request/PullRequestReviewCommentEdit.cs b/Octokit/Models/Request/PullRequestReviewCommentEdit.cs
index 987cb9885a..0d96b2e419 100644
--- a/Octokit/Models/Request/PullRequestReviewCommentEdit.cs
+++ b/Octokit/Models/Request/PullRequestReviewCommentEdit.cs
@@ -15,7 +15,7 @@ public class PullRequestReviewCommentEdit : RequestParameters
         /// <param name="body">The new text of the comment</param>
         public PullRequestReviewCommentEdit(string body)
         {
-            Ensure.ArgumentNotNullOrEmptyString(body, "body");
+            Ensure.ArgumentNotNullOrEmptyString(body, nameof(body));
 
             Body = body;
         }
diff --git a/Octokit/Models/Request/PullRequestReviewCommentReplyCreate.cs b/Octokit/Models/Request/PullRequestReviewCommentReplyCreate.cs
index 99d5caf8fb..d5b843d216 100644
--- a/Octokit/Models/Request/PullRequestReviewCommentReplyCreate.cs
+++ b/Octokit/Models/Request/PullRequestReviewCommentReplyCreate.cs
@@ -16,7 +16,7 @@ public class PullRequestReviewCommentReplyCreate : RequestParameters
         /// <param name="inReplyTo">The comment Id to reply to</param>
         public PullRequestReviewCommentReplyCreate(string body, int inReplyTo)
         {
-            Ensure.ArgumentNotNullOrEmptyString(body, "body");
+            Ensure.ArgumentNotNullOrEmptyString(body, nameof(body));
 
             Body = body;
             InReplyTo = inReplyTo;
diff --git a/Octokit/Models/Request/ReferenceUpdate.cs b/Octokit/Models/Request/ReferenceUpdate.cs
index 270bd64e3d..91198509a2 100644
--- a/Octokit/Models/Request/ReferenceUpdate.cs
+++ b/Octokit/Models/Request/ReferenceUpdate.cs
@@ -27,7 +27,7 @@ public ReferenceUpdate(string sha) : this(sha, false)
         /// </param>
         public ReferenceUpdate(string sha, bool force)
         {
-            Ensure.ArgumentNotNullOrEmptyString(sha, "sha");
+            Ensure.ArgumentNotNullOrEmptyString(sha, nameof(sha));
 
             Sha = sha;
             Force = force;
diff --git a/Octokit/Models/Request/ReleaseAssetUpdate.cs b/Octokit/Models/Request/ReleaseAssetUpdate.cs
index b3a312f0bd..f14770d60c 100644
--- a/Octokit/Models/Request/ReleaseAssetUpdate.cs
+++ b/Octokit/Models/Request/ReleaseAssetUpdate.cs
@@ -15,7 +15,7 @@ public class ReleaseAssetUpdate
         /// <param name="name">The name.</param>
         public ReleaseAssetUpdate(string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             Name = name;
         }
diff --git a/Octokit/Models/Request/RepositoryUpdate.cs b/Octokit/Models/Request/RepositoryUpdate.cs
index 75a7cc9e59..0a3925a47e 100644
--- a/Octokit/Models/Request/RepositoryUpdate.cs
+++ b/Octokit/Models/Request/RepositoryUpdate.cs
@@ -18,7 +18,7 @@ public class RepositoryUpdate
         /// <param name="name">The name of the repository. This is the only required parameter.</param>
         public RepositoryUpdate(string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             Name = name;
         }
diff --git a/Octokit/Models/Request/SearchCodeRequest.cs b/Octokit/Models/Request/SearchCodeRequest.cs
index 9f2ed89073..e281b48a80 100644
--- a/Octokit/Models/Request/SearchCodeRequest.cs
+++ b/Octokit/Models/Request/SearchCodeRequest.cs
@@ -41,8 +41,8 @@ public SearchCodeRequest(string term) : base(term)
         public SearchCodeRequest(string term, string owner, string name)
             : this(term)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             Repos.Add(owner, name);
         }
diff --git a/Octokit/Models/Request/SearchIssuesRequest.cs b/Octokit/Models/Request/SearchIssuesRequest.cs
index e615f33472..299111b1c0 100644
--- a/Octokit/Models/Request/SearchIssuesRequest.cs
+++ b/Octokit/Models/Request/SearchIssuesRequest.cs
@@ -501,8 +501,8 @@ public bool Remove(string owner, string name)
 
         static string GetRepositoryName(string owner, string name)
         {
-            Ensure.ArgumentNotNullOrEmptyString(owner, "owner");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
+            Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
             return string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, name);
         }
diff --git a/Octokit/Models/Request/Signature.cs b/Octokit/Models/Request/Signature.cs
index 6a5426805e..c315f62ab0 100644
--- a/Octokit/Models/Request/Signature.cs
+++ b/Octokit/Models/Request/Signature.cs
@@ -16,8 +16,8 @@ public class Signature
         /// <param name="email"></param>
         public Signature(string name, string email)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(email, "email");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(email, nameof(email));
 
             Name = name;
             Email = email;
diff --git a/Octokit/Models/Request/UserRename.cs b/Octokit/Models/Request/UserRename.cs
index 6a7bde76ff..0889b18b0a 100644
--- a/Octokit/Models/Request/UserRename.cs
+++ b/Octokit/Models/Request/UserRename.cs
@@ -17,7 +17,7 @@ public UserRename() { }
         /// <param name="login">The new login for the user.</param>
         public UserRename(string login)
         {
-            Ensure.ArgumentNotNullOrEmptyString(login, "login");
+            Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
             Login = login;
         }
diff --git a/Octokit/Models/Response/AdditionsAndDeletions.cs b/Octokit/Models/Response/AdditionsAndDeletions.cs
index 590e5deae8..f6aa16af99 100644
--- a/Octokit/Models/Response/AdditionsAndDeletions.cs
+++ b/Octokit/Models/Response/AdditionsAndDeletions.cs
@@ -28,7 +28,7 @@ public AdditionsAndDeletions(DateTimeOffset timestamp, int additions, int deleti
         /// <exception cref="ArgumentException">If the list of data points is not 3 elements</exception>
         public AdditionsAndDeletions(IList<long> additionsAndDeletions)
         {
-            Ensure.ArgumentNotNull(additionsAndDeletions, "additionsAndDeletions");
+            Ensure.ArgumentNotNull(additionsAndDeletions, nameof(additionsAndDeletions));
             if (additionsAndDeletions.Count != 3)
             {
                 throw new ArgumentException("Addition and deletion aggregate must only contain three data points.");
diff --git a/Octokit/Models/Response/CodeFrequency.cs b/Octokit/Models/Response/CodeFrequency.cs
index 38ea7b43d7..a022c7d635 100644
--- a/Octokit/Models/Response/CodeFrequency.cs
+++ b/Octokit/Models/Response/CodeFrequency.cs
@@ -16,7 +16,7 @@ public CodeFrequency() { }
 
         public CodeFrequency(IEnumerable<AdditionsAndDeletions> additionsAndDeletionsByWeek)
         {
-            Ensure.ArgumentNotNull(additionsAndDeletionsByWeek, "additionsAndDeletionsByWeek");
+            Ensure.ArgumentNotNull(additionsAndDeletionsByWeek, nameof(additionsAndDeletionsByWeek));
 
             AdditionsAndDeletionsByWeek = new ReadOnlyCollection<AdditionsAndDeletions>(additionsAndDeletionsByWeek.ToList());
         }
@@ -27,7 +27,7 @@ public CodeFrequency(IEnumerable<AdditionsAndDeletions> additionsAndDeletionsByW
         /// <param name="rawFrequencies">Raw data </param>
         public CodeFrequency(IEnumerable<IList<long>> rawFrequencies)
         {
-            Ensure.ArgumentNotNull(rawFrequencies, "rawFrequencies");
+            Ensure.ArgumentNotNull(rawFrequencies, nameof(rawFrequencies));
             AdditionsAndDeletionsByWeek = rawFrequencies.Select(point => new AdditionsAndDeletions(point)).ToList();
         }
 
diff --git a/Octokit/Models/Response/Commit.cs b/Octokit/Models/Response/Commit.cs
index 7023193790..7d85fbc3f8 100644
--- a/Octokit/Models/Response/Commit.cs
+++ b/Octokit/Models/Response/Commit.cs
@@ -13,7 +13,7 @@ public Commit() { }
         public Commit(string url, string label, string @ref, string sha, User user, Repository repository, string message, Committer author, Committer committer, GitReference tree, IEnumerable<GitReference> parents, int commentCount)
             : base(url, label, @ref, sha, user, repository)
         {
-            Ensure.ArgumentNotNull(parents, "parents");
+            Ensure.ArgumentNotNull(parents, nameof(parents));
 
             Message = message;
             Author = author;
diff --git a/Octokit/Models/Response/CommitActivity.cs b/Octokit/Models/Response/CommitActivity.cs
index 0916bcb955..aea52e8369 100644
--- a/Octokit/Models/Response/CommitActivity.cs
+++ b/Octokit/Models/Response/CommitActivity.cs
@@ -13,7 +13,7 @@ public CommitActivity() { }
 
         public CommitActivity(IEnumerable<WeeklyCommitActivity> activity)
         {
-            Ensure.ArgumentNotNull(activity, "activity");
+            Ensure.ArgumentNotNull(activity, nameof(activity));
 
             Activity = new ReadOnlyCollection<WeeklyCommitActivity>(activity.ToList());
         }
diff --git a/Octokit/Models/Response/Emoji.cs b/Octokit/Models/Response/Emoji.cs
index 63259eb04b..f5e69411f4 100644
--- a/Octokit/Models/Response/Emoji.cs
+++ b/Octokit/Models/Response/Emoji.cs
@@ -10,8 +10,8 @@ public Emoji() { }
 
         public Emoji(string name, string url)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNull(url, "url");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNull(url, nameof(url));
 
             Name = name;
             Url = url;
diff --git a/Octokit/Models/Response/GitIgnoreTemplate.cs b/Octokit/Models/Response/GitIgnoreTemplate.cs
index 081e2526fb..3a517df135 100644
--- a/Octokit/Models/Response/GitIgnoreTemplate.cs
+++ b/Octokit/Models/Response/GitIgnoreTemplate.cs
@@ -8,8 +8,8 @@ public class GitIgnoreTemplate
     {
         public GitIgnoreTemplate(string name, string source)
         {
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(source, "source");
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(source, nameof(source));
 
             Name = name;
             Source = source;
diff --git a/Octokit/Models/Response/License.cs b/Octokit/Models/Response/License.cs
index 61cc60f6d5..c5e9d7188a 100644
--- a/Octokit/Models/Response/License.cs
+++ b/Octokit/Models/Response/License.cs
@@ -24,14 +24,14 @@ public License(
             IEnumerable<string> permitted,
             IEnumerable<string> forbidden) : base(key, name, spdxId, url, featured)
         {
-            Ensure.ArgumentNotNull(htmlUrl, "htmlUrl");
-            Ensure.ArgumentNotNull(description, "description");
-            Ensure.ArgumentNotNull(category, "category");
-            Ensure.ArgumentNotNull(implementation, "implementation");
-            Ensure.ArgumentNotNull(body, "body");
-            Ensure.ArgumentNotNull(required, "required");
-            Ensure.ArgumentNotNull(permitted, "permitted");
-            Ensure.ArgumentNotNull(forbidden, "forbidden");
+            Ensure.ArgumentNotNull(htmlUrl, nameof(htmlUrl));
+            Ensure.ArgumentNotNull(description, nameof(description));
+            Ensure.ArgumentNotNull(category, nameof(category));
+            Ensure.ArgumentNotNull(implementation, nameof(implementation));
+            Ensure.ArgumentNotNull(body, nameof(body));
+            Ensure.ArgumentNotNull(required, nameof(required));
+            Ensure.ArgumentNotNull(permitted, nameof(permitted));
+            Ensure.ArgumentNotNull(forbidden, nameof(forbidden));
 
             HtmlUrl = htmlUrl;
             Description = description;
diff --git a/Octokit/Models/Response/LicenseMetadata.cs b/Octokit/Models/Response/LicenseMetadata.cs
index bba39bf281..2b066342f8 100644
--- a/Octokit/Models/Response/LicenseMetadata.cs
+++ b/Octokit/Models/Response/LicenseMetadata.cs
@@ -8,10 +8,10 @@ public class LicenseMetadata
     {
         public LicenseMetadata(string key, string name, string spdxId, string url, bool featured)
         {
-            Ensure.ArgumentNotNullOrEmptyString(key, "key");
-            Ensure.ArgumentNotNullOrEmptyString(name, "name");
-            Ensure.ArgumentNotNullOrEmptyString(spdxId, "spdxId");
-            Ensure.ArgumentNotNull(url, "url");
+            Ensure.ArgumentNotNullOrEmptyString(key, nameof(key));
+            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(spdxId, nameof(spdxId));
+            Ensure.ArgumentNotNull(url, nameof(url));
 
             Key = key;
             Name = name;
diff --git a/Octokit/Models/Response/Merge.cs b/Octokit/Models/Response/Merge.cs
index 02ce9826d1..c5e060bd09 100644
--- a/Octokit/Models/Response/Merge.cs
+++ b/Octokit/Models/Response/Merge.cs
@@ -12,7 +12,7 @@ public Merge() { }
 
         public Merge(Author author, Author committer, Commit commit, IEnumerable<GitReference> parents, string commentsUrl, int commentCount, string htmlUrl)
         {
-            Ensure.ArgumentNotNull(parents, "parents");
+            Ensure.ArgumentNotNull(parents, nameof(parents));
 
             Author = author;
             Committer = committer;
diff --git a/Octokit/Models/Response/MiscellaneousRateLimit.cs b/Octokit/Models/Response/MiscellaneousRateLimit.cs
index 6d773a5bca..082d565efc 100644
--- a/Octokit/Models/Response/MiscellaneousRateLimit.cs
+++ b/Octokit/Models/Response/MiscellaneousRateLimit.cs
@@ -10,8 +10,8 @@ public MiscellaneousRateLimit() { }
 
         public MiscellaneousRateLimit(ResourceRateLimit resources, RateLimit rate)
         {
-            Ensure.ArgumentNotNull(resources, "resource");
-            Ensure.ArgumentNotNull(rate, "rate");
+            Ensure.ArgumentNotNull(resources, nameof(resources));
+            Ensure.ArgumentNotNull(rate, nameof(rate));
 
             Resources = resources;
             Rate = rate;
diff --git a/Octokit/Models/Response/Participation.cs b/Octokit/Models/Response/Participation.cs
index 84c0d6c295..0c384e25bf 100644
--- a/Octokit/Models/Response/Participation.cs
+++ b/Octokit/Models/Response/Participation.cs
@@ -16,8 +16,8 @@ public Participation() { }
 
         public Participation(IEnumerable<int> all, IEnumerable<int> owner)
         {
-            Ensure.ArgumentNotNull(all, "all");
-            Ensure.ArgumentNotNull(owner, "owner");
+            Ensure.ArgumentNotNull(all, nameof(all));
+            Ensure.ArgumentNotNull(owner, nameof(owner));
 
             All = new ReadOnlyCollection<int>(all.ToList());
             Owner = new ReadOnlyCollection<int>(owner.ToList());
diff --git a/Octokit/Models/Response/PullRequestCommit.cs b/Octokit/Models/Response/PullRequestCommit.cs
index 67befba05f..fca85bfaaa 100644
--- a/Octokit/Models/Response/PullRequestCommit.cs
+++ b/Octokit/Models/Response/PullRequestCommit.cs
@@ -13,7 +13,7 @@ public PullRequestCommit() { }
 
         public PullRequestCommit(Committer author, string commentsUrl, Commit commit, Committer committer, string htmlUrl, IEnumerable<GitReference> parents, string sha, string url)
         {
-            Ensure.ArgumentNotNull(parents, "parents");
+            Ensure.ArgumentNotNull(parents, nameof(parents));
 
             Author = author;
             CommentsUrl = commentsUrl;
diff --git a/Octokit/Models/Response/PunchCard.cs b/Octokit/Models/Response/PunchCard.cs
index 00f5dd42b8..4aea7bab63 100644
--- a/Octokit/Models/Response/PunchCard.cs
+++ b/Octokit/Models/Response/PunchCard.cs
@@ -14,7 +14,7 @@ public PunchCard() { }
 
         public PunchCard(IEnumerable<IList<int>> punchCardData)
         {
-            Ensure.ArgumentNotNull(punchCardData, "punchCardData");
+            Ensure.ArgumentNotNull(punchCardData, nameof(punchCardData));
             PunchPoints = new ReadOnlyCollection<PunchCardPoint>(
                 punchCardData.Select(point => new PunchCardPoint(point)).ToList());
         }
diff --git a/Octokit/Models/Response/PunchCardPoint.cs b/Octokit/Models/Response/PunchCardPoint.cs
index 9492587e27..ff8fdc01b9 100644
--- a/Octokit/Models/Response/PunchCardPoint.cs
+++ b/Octokit/Models/Response/PunchCardPoint.cs
@@ -12,7 +12,7 @@ public PunchCardPoint() { }
 
         public PunchCardPoint(IList<int> punchPoint)
         {
-            Ensure.ArgumentNotNull(punchPoint, "punchPoint");
+            Ensure.ArgumentNotNull(punchPoint, nameof(punchPoint));
             if (punchPoint.Count != 3)
             {
                 throw new ArgumentException("Daily punch card must only contain three data points.");
diff --git a/Octokit/Models/Response/Readme.cs b/Octokit/Models/Response/Readme.cs
index 69a43d855f..77bf87a4d5 100644
--- a/Octokit/Models/Response/Readme.cs
+++ b/Octokit/Models/Response/Readme.cs
@@ -16,8 +16,8 @@ public Readme() { }
 
         internal Readme(ReadmeResponse response, IApiConnection client)
         {
-            Ensure.ArgumentNotNull(response, "response");
-            Ensure.ArgumentNotNull(client, "client");
+            Ensure.ArgumentNotNull(response, nameof(response));
+            Ensure.ArgumentNotNull(client, nameof(client));
 
             Name = response.Name;
             Url = response.Url;
diff --git a/Octokit/Models/Response/RepositoryContentLicense.cs b/Octokit/Models/Response/RepositoryContentLicense.cs
index 01082a6649..65a9515859 100644
--- a/Octokit/Models/Response/RepositoryContentLicense.cs
+++ b/Octokit/Models/Response/RepositoryContentLicense.cs
@@ -9,7 +9,7 @@ public class RepositoryContentLicense : RepositoryContentInfo
         public RepositoryContentLicense(LicenseMetadata license, string name, string path, string sha, int size, ContentType type, string downloadUrl, string url, string gitUrl, string htmlUrl)
             : base(name, path, sha, size, type, downloadUrl, url, gitUrl, htmlUrl)
         {
-            Ensure.ArgumentNotNull(license, "license");
+            Ensure.ArgumentNotNull(license, nameof(license));
 
             License = license;
         }
diff --git a/Octokit/Models/Response/ResourceRateLimit.cs b/Octokit/Models/Response/ResourceRateLimit.cs
index 25da07753d..6ec99c2b15 100644
--- a/Octokit/Models/Response/ResourceRateLimit.cs
+++ b/Octokit/Models/Response/ResourceRateLimit.cs
@@ -10,8 +10,8 @@ public ResourceRateLimit() { }
 
         public ResourceRateLimit(RateLimit core, RateLimit search)
         {
-            Ensure.ArgumentNotNull(core, "core");
-            Ensure.ArgumentNotNull(search, "search");
+            Ensure.ArgumentNotNull(core, nameof(core));
+            Ensure.ArgumentNotNull(search, nameof(search));
 
             Core = core;
             Search = search;
diff --git a/Octokit/Models/Response/WeeklyCommitActivity.cs b/Octokit/Models/Response/WeeklyCommitActivity.cs
index 7f504da0f9..713fa04b03 100644
--- a/Octokit/Models/Response/WeeklyCommitActivity.cs
+++ b/Octokit/Models/Response/WeeklyCommitActivity.cs
@@ -15,7 +15,7 @@ public WeeklyCommitActivity() { }
 
         public WeeklyCommitActivity(IEnumerable<int> days, int total, long week)
         {
-            Ensure.ArgumentNotNull(days, "days");
+            Ensure.ArgumentNotNull(days, nameof(days));
 
             Days = new ReadOnlyCollection<int>(days.ToList());
             Total = total;