fix: comment id model update to long instead of int

* #2927: comment id model update to long instead of int

* #2927: code review fixes (1)

* #2927: code review fixes (2)

* #2927: comment id model update to long instead of int: unit tests fix

* #2927: code review fixes

* Fixed most names of parameters

---------

Co-authored-by: Victor Vorobyev <victor@myrtle-sa.com>
Co-authored-by: Brian C. Arnold <brian.arnold@spiderrock.net>

Octokit.Reactive/Clients/IObservableCommitCommentReactionsClient.cs

@@ -17,20 +17,20 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
         /// <returns></returns>
-        IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
         /// <returns></returns>
-        IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// List reactions for a specified Commit Comment
@@ -38,9 +38,9 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        IObservable<Reaction> GetAll(string owner, string name, int number);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// List reactions for a specified Commit Comment
@@ -48,29 +48,29 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// List reactions for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        IObservable<Reaction> GetAll(long repositoryId, int number);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// List reactions for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -81,7 +81,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId);
+        IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -91,6 +91,6 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(long repositoryId, int commentId, int reactionId);
+        IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit.Reactive/Clients/IObservableGistCommentsClient.cs

@@ -15,7 +15,7 @@ namespace Octokit.Reactive
         /// <returns>IObservable{GistComment}.</returns>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
             Justification = "Method makes a network request")]
-        IObservable<GistComment> Get(string gistId, int commentId);
+        IObservable<GistComment> Get(string gistId, long commentId);
 
         /// <summary>
         /// Gets all comments for the gist with the specified id.
@@ -51,7 +51,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The id of the comment</param>
         /// <param name="comment">The updated body of the comment</param>
         /// <returns>IObservable{GistComment}.</returns>
-        IObservable<GistComment> Update(string gistId, int commentId, string comment);
+        IObservable<GistComment> Update(string gistId, long commentId, string comment);
 
         /// <summary>
         /// Deletes the comment with the specified gist- and comment id.
@@ -60,6 +60,6 @@ namespace Octokit.Reactive
         /// <param name="gistId">The id of the gist</param>
         /// <param name="commentId">The id of the comment</param>
         /// <returns>IObservable{Unit}.</returns>
-        IObservable<Unit> Delete(string gistId, int commentId);
+        IObservable<Unit> Delete(string gistId, long commentId);
     }
 }

Octokit.Reactive/Clients/IObservableIssueCommentReactionsClient.cs

@@ -17,18 +17,18 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
-        IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
-        IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// List reactions for a specified Issue Comment
@@ -36,8 +36,8 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Reaction> GetAll(string owner, string name, int number);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// List reactions for a specified Issue Comment
@@ -45,26 +45,26 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// List reactions for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Reaction> GetAll(long repositoryId, int number);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// List reactions for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue Comment
@@ -75,7 +75,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId);
+        IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -85,6 +85,6 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(long repositoryId, int commentId, int reactionId);
+        IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit.Reactive/Clients/IObservableIssueCommentsClient.cs

@@ -18,20 +18,20 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
             Justification = "Method makes a network request")]
-        IObservable<IssueComment> Get(string owner, string name, int id);
+        IObservable<IssueComment> Get(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single Issue Comment by id.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
             Justification = "Method makes a network request")]
-        IObservable<IssueComment> Get(long repositoryId, int id);
+        IObservable<IssueComment> Get(long repositoryId, long commentId);
 
         /// <summary>
         /// Gets Issue Comments for a repository.
@@ -202,18 +202,18 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        IObservable<IssueComment> Update(string owner, string name, int id, string commentUpdate);
+        IObservable<IssueComment> Update(string owner, string name, long commentId, string commentUpdate);
 
         /// <summary>
         /// Updates a specified Issue Comment.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        IObservable<IssueComment> Update(long repositoryId, int id, string commentUpdate);
+        IObservable<IssueComment> Update(long repositoryId, long commentId, string commentUpdate);
 
         /// <summary>
         /// Deletes the specified Issue Comment
@@ -221,15 +221,15 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Unit> Delete(string owner, string name, int id);
+        IObservable<Unit> Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes the specified Issue Comment
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Unit> Delete(long repositoryId, int id);
+        IObservable<Unit> Delete(long repositoryId, long commentId);
     }
 }

Octokit.Reactive/Clients/IObservableIssueReactionsClient.cs

@@ -75,7 +75,7 @@ namespace Octokit.Reactive
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(string owner, string name, int issueNumber, int reactionId);
+        IObservable<Unit> Delete(string owner, string name, int issueNumber, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -85,6 +85,6 @@ namespace Octokit.Reactive
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(long repositoryId, int issueNumber, int reactionId);
+        IObservable<Unit> Delete(long repositoryId, int issueNumber, long reactionId);
     }
 }

Octokit.Reactive/Clients/IObservablePullRequestReviewCommentReactionsClient.cs

@@ -17,8 +17,8 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Reaction> GetAll(string owner, string name, int number);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
@@ -26,26 +26,26 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Reaction> GetAll(long repositoryId, int number);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options);
+        IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Creates a reaction for a specified Pull Request Review Comment.
@@ -53,18 +53,18 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Deletes a reaction for a specified Pull Request comment
@@ -75,7 +75,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId);
+        IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Pull Request comment
@@ -85,6 +85,6 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        IObservable<Unit> Delete(long repositoryId, int commentId, int reactionId);
+        IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit.Reactive/Clients/IObservablePullRequestReviewCommentsClient.cs

@@ -121,16 +121,16 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        IObservable<PullRequestReviewComment> GetComment(string owner, string name, int number);
+        IObservable<PullRequestReviewComment> GetComment(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single pull request review comment by number.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        IObservable<PullRequestReviewComment> GetComment(long repositoryId, int number);
+        IObservable<PullRequestReviewComment> GetComment(long repositoryId, long commentId);
 
         /// <summary>
         /// Creates a comment on a pull request review.
@@ -176,18 +176,18 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        IObservable<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment);
+        IObservable<PullRequestReviewComment> Edit(string owner, string name, long commentId, PullRequestReviewCommentEdit comment);
 
         /// <summary>
         /// Edits a comment on a pull request review.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        IObservable<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment);
+        IObservable<PullRequestReviewComment> Edit(long repositoryId, long commentId, PullRequestReviewCommentEdit comment);
 
         /// <summary>
         /// Deletes a comment on a pull request review.
@@ -195,15 +195,15 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        IObservable<Unit> Delete(string owner, string name, int number);
+        IObservable<Unit> Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes a comment on a pull request review.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        IObservable<Unit> Delete(long repositoryId, int number);
+        IObservable<Unit> Delete(long repositoryId, long commentId);
     }
 }

Octokit.Reactive/Clients/IObservableRepositoryCommentsClient.cs

@@ -18,20 +18,20 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        IObservable<CommitComment> Get(string owner, string name, int number);
+        IObservable<CommitComment> Get(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single Repository Comment by number.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        IObservable<CommitComment> Get(long repositoryId, int number);
+        IObservable<CommitComment> Get(long repositoryId, long commentId);
 
         /// <summary>
         /// Gets Commit Comments for a repository.
@@ -126,18 +126,18 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        IObservable<CommitComment> Update(string owner, string name, int number, string commentUpdate);
+        IObservable<CommitComment> Update(string owner, string name, long commentId, string commentUpdate);
 
         /// <summary>
         /// Updates a specified Commit Comment.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        IObservable<CommitComment> Update(long repositoryId, int number, string commentUpdate);
+        IObservable<CommitComment> Update(long repositoryId, long commentId, string commentUpdate);
 
         /// <summary>
         /// Deletes the specified Commit Comment
@@ -145,15 +145,15 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Unit> Delete(string owner, string name, int number);
+        IObservable<Unit> Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes the specified Commit Comment
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        IObservable<Unit> Delete(long repositoryId, int number);
+        IObservable<Unit> Delete(long repositoryId, long commentId);
     }
 }

Octokit.Reactive/Clients/ObservableCommitCommentReactionsClient.cs

@@ -30,16 +30,16 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         /// <returns></returns>
-        public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(owner, name, number, reaction).ToObservable();
+            return _client.Create(owner, name, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -47,14 +47,14 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
         /// <returns></returns>
-        public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(repositoryId, number, reaction).ToObservable();
+            return _client.Create(repositoryId, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -63,11 +63,11 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public IObservable<Reaction> GetAll(string owner, string name, int number)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId)
         {
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -76,16 +76,16 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        public IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.CommitCommentReactions(owner, name, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.CommitCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -93,11 +93,11 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public IObservable<Reaction> GetAll(long repositoryId, int number)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -105,14 +105,14 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        public IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -124,7 +124,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId)
+        public IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -139,13 +139,13 @@ namespace Octokit.Reactive
         /// <remarks>https://docs.github.com/rest/reactions#delete-a-commit-comment-reaction</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="commentId">The comment id</param>
-        /// <param name="reactionid">The reaction id</param>
+        /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(long repositoryId, int commentId, int reactionid)
+        public IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId)
         {
-            Ensure.ArgumentNotNull(reactionid, nameof(reactionid));
+            Ensure.ArgumentNotNull(reactionId, nameof(reactionId));
 
-            return _client.Delete(repositoryId, commentId, reactionid).ToObservable();
+            return _client.Delete(repositoryId, commentId, reactionId).ToObservable();
         }
     }
 }

Octokit.Reactive/Clients/ObservableGistCommentsClient.cs

@@ -25,7 +25,7 @@ namespace Octokit.Reactive
         /// <param name="gistId">The id of the gist</param>
         /// <param name="commentId">The id of the comment</param>
         /// <returns>IObservable{GistComment}.</returns>
-        public IObservable<GistComment> Get(string gistId, int commentId)
+        public IObservable<GistComment> Get(string gistId, long commentId)
         {
             return _client.Get(gistId, commentId).ToObservable();
         }
@@ -80,7 +80,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The id of the comment</param>
         /// <param name="comment">The updated body of the comment</param>
         /// <returns>IObservable{GistComment}.</returns>
-        public IObservable<GistComment> Update(string gistId, int commentId, string comment)
+        public IObservable<GistComment> Update(string gistId, long commentId, string comment)
         {
             Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
@@ -94,7 +94,7 @@ namespace Octokit.Reactive
         /// <param name="gistId">The id of the gist</param>
         /// <param name="commentId">The id of the comment</param>
         /// <returns>IObservable{Unit}.</returns>
-        public IObservable<Unit> Delete(string gistId, int commentId)
+        public IObservable<Unit> Delete(string gistId, long commentId)
         {
             return _client.Delete(gistId, commentId).ToObservable();
         }

Octokit.Reactive/Clients/ObservableIssueCommentReactionsClient.cs

@@ -30,15 +30,15 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
-        public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(owner, name, number, reaction).ToObservable();
+            return _client.Create(owner, name, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -46,13 +46,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create </param>
-        public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(repositoryId, number, reaction).ToObservable();
+            return _client.Create(repositoryId, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -61,13 +61,13 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Reaction> GetAll(string owner, string name, int number)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -76,15 +76,15 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueCommentReactions(owner, name, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -92,10 +92,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int number)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -103,13 +103,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -121,7 +121,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId)
+        public IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -138,7 +138,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(long repositoryId, int commentId, int reactionId)
+        public IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNull(reactionId, nameof(reactionId));
 

Octokit.Reactive/Clients/ObservableIssueCommentsClient.cs

@@ -30,13 +30,13 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
-        public IObservable<IssueComment> Get(string owner, string name, int id)
+        public IObservable<IssueComment> Get(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Get(owner, name, id).ToObservable();
+            return _client.Get(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
@@ -44,10 +44,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
-        public IObservable<IssueComment> Get(long repositoryId, int id)
+        public IObservable<IssueComment> Get(long repositoryId, long commentId)
         {
-            return _client.Get(repositoryId, id).ToObservable();
+            return _client.Get(repositoryId, commentId).ToObservable();
         }
 
         /// <summary>
@@ -326,15 +326,15 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        public IObservable<IssueComment> Update(string owner, string name, int id, string commentUpdate)
+        public IObservable<IssueComment> Update(string owner, string name, long commentId, string commentUpdate)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
-            return _client.Update(owner, name, id, commentUpdate).ToObservable();
+            return _client.Update(owner, name, commentId, commentUpdate).ToObservable();
         }
 
         /// <summary>
@@ -342,13 +342,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        public IObservable<IssueComment> Update(long repositoryId, int id, string commentUpdate)
+        public IObservable<IssueComment> Update(long repositoryId, long commentId, string commentUpdate)
         {
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
-            return _client.Update(repositoryId, id, commentUpdate).ToObservable();
+            return _client.Update(repositoryId, commentId, commentUpdate).ToObservable();
         }
 
         /// <summary>
@@ -357,13 +357,13 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Unit> Delete(string owner, string name, int id)
+        public IObservable<Unit> Delete(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Delete(owner, name, id).ToObservable();
+            return _client.Delete(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
@@ -371,10 +371,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Unit> Delete(long repositoryId, int id)
+        public IObservable<Unit> Delete(long repositoryId, long commentId)
         {
-            return _client.Delete(repositoryId, id).ToObservable();
+            return _client.Delete(repositoryId, commentId).ToObservable();
         }
     }
 }

Octokit.Reactive/Clients/ObservableIssueReactionsClient.cs

@@ -118,7 +118,7 @@ namespace Octokit.Reactive
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(string owner, string name, int issueNumber, int reactionId)
+        public IObservable<Unit> Delete(string owner, string name, int issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -135,7 +135,7 @@ namespace Octokit.Reactive
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(long repositoryId, int issueNumber, int reactionId)
+        public IObservable<Unit> Delete(long repositoryId, int issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNull(reactionId, nameof(reactionId));
 

Octokit.Reactive/Clients/ObservablePullRequestReviewCommentReactionsClient.cs

@@ -30,19 +30,19 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Reaction> GetAll(string owner, string name, int number)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId)
         {
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
-        public IObservable<Reaction> GetAll(string owner, string name, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -50,10 +50,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int number)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -61,13 +61,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        public IObservable<Reaction> GetAll(long repositoryId, int number, ApiOptions options)
+        public IObservable<Reaction> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, number), null, options);
+            return _connection.GetAndFlattenAllPages<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -76,15 +76,15 @@ namespace Octokit.Reactive
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        public IObservable<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(string owner, string name, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(owner, name, number, reaction).ToObservable();
+            return _client.Create(owner, name, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -92,13 +92,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        public IObservable<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public IObservable<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return _client.Create(repositoryId, number, reaction).ToObservable();
+            return _client.Create(repositoryId, commentId, reaction).ToObservable();
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(string owner, string name, int commentId, int reactionId)
+        public IObservable<Unit> Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -127,7 +127,7 @@ namespace Octokit.Reactive
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        public IObservable<Unit> Delete(long repositoryId, int commentId, int reactionId)
+        public IObservable<Unit> Delete(long repositoryId, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNull(reactionId, nameof(reactionId));
 

Octokit.Reactive/Clients/ObservablePullRequestReviewCommentsClient.cs

@@ -202,13 +202,13 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        public IObservable<PullRequestReviewComment> GetComment(string owner, string name, int number)
+        public IObservable<PullRequestReviewComment> GetComment(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.GetComment(owner, name, number).ToObservable();
+            return _client.GetComment(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
@@ -216,10 +216,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        public IObservable<PullRequestReviewComment> GetComment(long repositoryId, int number)
+        public IObservable<PullRequestReviewComment> GetComment(long repositoryId, long commentId)
         {
-            return _client.GetComment(repositoryId, number).ToObservable();
+            return _client.GetComment(repositoryId, commentId).ToObservable();
         }
 
         /// <summary>
@@ -290,15 +290,15 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        public IObservable<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment)
+        public IObservable<PullRequestReviewComment> Edit(string owner, string name, long commentId, PullRequestReviewCommentEdit comment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            return _client.Edit(owner, name, number, comment).ToObservable();
+            return _client.Edit(owner, name, commentId, comment).ToObservable();
         }
 
         /// <summary>
@@ -306,13 +306,13 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        public IObservable<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment)
+        public IObservable<PullRequestReviewComment> Edit(long repositoryId, long commentId, PullRequestReviewCommentEdit comment)
         {
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            return _client.Edit(repositoryId, number, comment).ToObservable();
+            return _client.Edit(repositoryId, commentId, comment).ToObservable();
         }
 
         /// <summary>
@@ -321,13 +321,13 @@ namespace Octokit.Reactive
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        public IObservable<Unit> Delete(string owner, string name, int number)
+        public IObservable<Unit> Delete(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Delete(owner, name, number).ToObservable();
+            return _client.Delete(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
@@ -335,10 +335,10 @@ namespace Octokit.Reactive
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        public IObservable<Unit> Delete(long repositoryId, int number)
+        public IObservable<Unit> Delete(long repositoryId, long commentId)
         {
-            return _client.Delete(repositoryId, number).ToObservable();
+            return _client.Delete(repositoryId, commentId).ToObservable();
         }
     }
 }

Octokit.Reactive/Clients/ObservableRepositoryCommentsClient.cs

@@ -29,25 +29,25 @@ namespace Octokit.Reactive
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
-        public IObservable<CommitComment> Get(string owner, string name, int number)
+        public IObservable<CommitComment> Get(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Get(owner, name, number).ToObservable();
+            return _client.Get(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
         /// Gets a single Repository Comment by number.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
-        public IObservable<CommitComment> Get(long repositoryId, int number)
+        public IObservable<CommitComment> Get(long repositoryId, long commentId)
         {
-            return _client.Get(repositoryId, number).ToObservable();
+            return _client.Get(repositoryId, commentId).ToObservable();
         }
 
         /// <summary>
@@ -203,30 +203,30 @@ namespace Octokit.Reactive
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         /// <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)
+        public IObservable<CommitComment> Update(string owner, string name, long commentId, string commentUpdate)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
-            return _client.Update(owner, name, number, commentUpdate).ToObservable();
+            return _client.Update(owner, name, commentId, commentUpdate).ToObservable();
         }
 
         /// <summary>
         /// Updates a specified Commit Comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
-        public IObservable<CommitComment> Update(long repositoryId, int number, string commentUpdate)
+        public IObservable<CommitComment> Update(long repositoryId, long commentId, string commentUpdate)
         {
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
-            return _client.Update(repositoryId, number, commentUpdate).ToObservable();
+            return _client.Update(repositoryId, commentId, commentUpdate).ToObservable();
         }
 
         /// <summary>
@@ -234,25 +234,25 @@ namespace Octokit.Reactive
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
-        public IObservable<Unit> Delete(string owner, string name, int number)
+        public IObservable<Unit> Delete(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return _client.Delete(owner, name, number).ToObservable();
+            return _client.Delete(owner, name, commentId).ToObservable();
         }
 
         /// <summary>
         /// Deletes the specified Commit Comment
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
-        public IObservable<Unit> Delete(long repositoryId, int number)
+        public IObservable<Unit> Delete(long repositoryId, long commentId)
         {
-            return _client.Delete(repositoryId, number).ToObservable();
+            return _client.Delete(repositoryId, commentId).ToObservable();
         }
     }
 }

Octokit.Tests.Integration/Clients/IssueCommentsClientTests.cs

@@ -219,7 +219,7 @@ public class IssueCommentsClientTests
             var numberToCreate = 2;
             using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("IssueCommentsReactionTests")))
             {
-                var commentIds = new List<int>();
+                var commentIds = new List<long>();
 
                 // Create multiple test issues
                 for (int count = 1; count <= numberToCreate; count++)
@@ -404,7 +404,7 @@ public class IssueCommentsClientTests
             var numberToCreate = 2;
             using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("IssueCommentsReactionTests")))
             {
-                var commentIds = new List<int>();
+                var commentIds = new List<long>();
 
                 // Create a single test issue
                 var issueNumber = await HelperCreateIssue(context.RepositoryOwner, context.RepositoryName);
@@ -594,7 +594,7 @@ public class IssueCommentsClientTests
         return issue.Number;
     }
 
-    async static Task<int> HelperCreateIssueCommentWithReactions(string owner, string repo, int number)
+    async static Task<long> HelperCreateIssueCommentWithReactions(string owner, string repo, int number)
     {
         var github = Helper.GetAuthenticatedClient();
 

Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs

@@ -928,7 +928,7 @@ public class PullRequestReviewCommentsClientTests : IDisposable
         int numberToCreate = 2;
         using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("PullRequestReviewCommentsReactionTests")))
         {
-            var commentIds = new List<int>();
+            var commentIds = new List<long>();
 
             // Create a test pull request
             var pullRequest = await CreatePullRequest(context);
@@ -967,7 +967,7 @@ public class PullRequestReviewCommentsClientTests : IDisposable
         int numberToCreate = 2;
         using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("PullRequestReviewCommentsReactionTests")))
         {
-            var commentIds = new List<int>();
+            var commentIds = new List<long>();
 
             // Create multiple test pull requests
             for (int count = 1; count <= numberToCreate; count++)
@@ -1000,7 +1000,7 @@ public class PullRequestReviewCommentsClientTests : IDisposable
         }
     }
 
-    async Task<int> HelperCreatePullRequestReviewCommentWithReactions(string owner, string repo, PullRequestData pullRequest)
+    async Task<long> HelperCreatePullRequestReviewCommentWithReactions(string owner, string repo, PullRequestData pullRequest)
     {
         var github = Helper.GetAuthenticatedClient();
 

Octokit.Tests.Integration/Clients/RepositoryCommentsClientTests.cs

@@ -206,7 +206,7 @@ public class RepositoryCommentsClientTests
             var numberToCreate = 2;
             using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("CommitCommentsReactionTests")))
             {
-                var commentIds = new List<int>();
+                var commentIds = new List<long>();
 
                 // Create multiple test commits
                 for (int count = 1; count <= numberToCreate; count++)
@@ -381,7 +381,7 @@ public class RepositoryCommentsClientTests
             var numberToCreate = 2;
             using (var context = await _github.CreateRepositoryContextWithAutoInit(Helper.MakeNameWithTimestamp("CommitCommentsReactionTests")))
             {
-                var commentIds = new List<int>();
+                var commentIds = new List<long>();
 
                 // Create a single test commit
                 var commit = await HelperCreateCommit(context.RepositoryOwner, context.RepositoryName);
@@ -746,7 +746,7 @@ public class RepositoryCommentsClientTests
         return await client.Git.Commit.Create(owner, repo, newCommit);
     }
 
-    async static Task<int> HelperCreateCommitCommentWithReactions(string owner, string repo, string sha)
+    async static Task<long> HelperCreateCommitCommentWithReactions(string owner, string repo, string sha)
     {
         var github = Helper.GetAuthenticatedClient();
 

Octokit.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 17
-VisualStudioVersion = 15.0.27130.2010
+VisualStudioVersion = 17.10.34928.147
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit", "Octokit\Octokit.csproj", "{104E8324-C2B9-43BE-8040-36B736A64D45}"
 EndProject
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{64FD6CD6
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.AsyncPaginationExtension", "Octokit.AsyncPaginationExtension\Octokit.AsyncPaginationExtension.csproj", "{0E8013E0-0CCF-4433-9E01-51AC288824C5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Generators", "Octokit.Generators\Octokit.Generators.csproj", "{6A577AD0-2319-4FFC-8EF2-3CCDD31B0CD9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Octokit.Generators", "Octokit.Generators\Octokit.Generators.csproj", "{6A577AD0-2319-4FFC-8EF2-3CCDD31B0CD9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Octokit/Clients/AuthorizationsClient.cs

@@ -66,16 +66,16 @@ namespace Octokit
         /// This method requires authentication.
         /// See the <a href="http://developer.github.com/v3/oauth/#get-a-single-authorization">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The Id of the <see cref="Authorization"/> to get</param>
+        /// <param name="authorizationId">The Id of the <see cref="Authorization"/> to get</param>
         /// <exception cref="AuthorizationException">
         /// Thrown when the current user does not have permission to make this request.
         /// </exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>The specified <see cref="Authorization"/>.</returns>
         [ManualRoute("GET", "/authorizations/{id}")]
-        public Task<Authorization> Get(int id)
+        public Task<Authorization> Get(int authorizationId)
         {
-            return ApiConnection.Get<Authorization>(ApiUrls.Authorizations(id), null);
+            return ApiConnection.Get<Authorization>(ApiUrls.Authorizations(authorizationId), null);
         }
 
 
@@ -418,7 +418,7 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/oauth/#update-an-existing-authorization">API
         /// documentation</a> for more details.
         /// </remarks>
-        /// <param name="id">Id of the <see cref="Authorization"/> to update</param>
+        /// <param name="authorizationId">Id of the <see cref="Authorization"/> to update</param>
         /// <param name="authorizationUpdate">Describes the changes to make to the authorization</param>
         /// <exception cref="AuthorizationException">
         /// Thrown when the current user does not have permission to make the request.
@@ -426,12 +426,12 @@ namespace Octokit
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>The updated <see cref="Authorization"/>.</returns>
         [ManualRoute("PATCH", "/authorizations/{id}")]
-        public Task<Authorization> Update(int id, AuthorizationUpdate authorizationUpdate)
+        public Task<Authorization> Update(int authorizationId, AuthorizationUpdate authorizationUpdate)
         {
             Ensure.ArgumentNotNull(authorizationUpdate, nameof(authorizationUpdate));
 
             return ApiConnection.Patch<Authorization>(
-                ApiUrls.Authorizations(id),
+                ApiUrls.Authorizations(authorizationId),
                 authorizationUpdate);
         }
 
@@ -443,16 +443,16 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/oauth/#delete-an-authorization">API
         /// documentation</a> for more details.
         /// </remarks>
-        /// <param name="id">The system-wide Id of the authorization to delete</param>
+        /// <param name="authorizationId">The system-wide Id of the authorization to delete</param>
         /// <exception cref="AuthorizationException">
         /// Thrown when the current user does not have permission to make the request.
         /// </exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         [ManualRoute("DELETE", "/authorizations/{id}")]
-        public Task Delete(int id)
+        public Task Delete(int authorizationId)
         {
-            return ApiConnection.Delete(ApiUrls.Authorizations(id));
+            return ApiConnection.Delete(ApiUrls.Authorizations(authorizationId));
         }
 
         /// <summary>
@@ -463,7 +463,7 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/oauth/#delete-an-authorization">API
         /// documentation</a> for more details.
         /// </remarks>
-        /// <param name="id">The system-wide Id of the authorization to delete</param>
+        /// <param name="authorizationId">The system-wide Id of the authorization to delete</param>
         /// <param name="twoFactorAuthenticationCode">Two factor authorization code</param>
         /// <exception cref="AuthorizationException">
         /// Thrown when the current user does not have permission to make the request.
@@ -471,9 +471,9 @@ namespace Octokit
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>A <see cref="Task"/> for the request's execution.</returns>
         [ManualRoute("DELETE", "/authorizations/{id}")]
-        public Task Delete(int id, string twoFactorAuthenticationCode)
+        public Task Delete(int authorizationId, string twoFactorAuthenticationCode)
         {
-            return ApiConnection.Delete(ApiUrls.Authorizations(id), twoFactorAuthenticationCode);
+            return ApiConnection.Delete(ApiUrls.Authorizations(authorizationId), twoFactorAuthenticationCode);
         }
     }
 }

Octokit/Clients/CheckSuitesClient.cs

@@ -28,15 +28,15 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#get-a-single-check-suite">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="checkSuiteId">The Id of the check suite</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/check-suites/{id}")]
-        public Task<CheckSuite> Get(string owner, string name, long checkSuiteId)
+        public Task<CheckSuite> Get(string owner, string repoName, long checkSuiteId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
-            return ApiConnection.Get<CheckSuite>(ApiUrls.CheckSuite(owner, name, checkSuiteId), null);
+            return ApiConnection.Get<CheckSuite>(ApiUrls.CheckSuite(owner, repoName, checkSuiteId), null);
         }
 
         /// <summary>
@@ -60,16 +60,16 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#list-check-suites-for-a-specific-ref">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="reference">The reference (SHA, branch name or tag name) to list check suites for</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/commits/{ref}/check-suites")]
-        public Task<CheckSuitesResponse> GetAllForReference(string owner, string name, string reference)
+        public Task<CheckSuitesResponse> GetAllForReference(string owner, string repoName, string reference)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
             Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
 
-            return GetAllForReference(owner, name, reference, new CheckSuiteRequest(), ApiOptions.None);
+            return GetAllForReference(owner, repoName, reference, new CheckSuiteRequest(), ApiOptions.None);
         }
 
         /// <summary>
@@ -95,18 +95,18 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#list-check-suites-for-a-specific-ref">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="reference">The reference (SHA, branch name or tag name) to list check suites for</param>
         /// <param name="request">Details to filter the request, such as by App Id or Check Name</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/commits/{ref}/check-suites")]
-        public Task<CheckSuitesResponse> GetAllForReference(string owner, string name, string reference, CheckSuiteRequest request)
+        public Task<CheckSuitesResponse> GetAllForReference(string owner, string repoName, string reference, CheckSuiteRequest request)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
             Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
             Ensure.ArgumentNotNull(request, nameof(request));
 
-            return GetAllForReference(owner, name, reference, request, ApiOptions.None);
+            return GetAllForReference(owner, repoName, reference, request, ApiOptions.None);
         }
 
         /// <summary>
@@ -134,20 +134,20 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#list-check-suites-for-a-specific-ref">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="reference">The reference (SHA, branch name or tag name) to list check suites for</param>
         /// <param name="request">Details to filter the request, such as by App Id or Check Name</param>
         /// <param name="options">Options to change the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/commits/{ref}/check-suites")]
-        public async Task<CheckSuitesResponse> GetAllForReference(string owner, string name, string reference, CheckSuiteRequest request, ApiOptions options)
+        public async Task<CheckSuitesResponse> GetAllForReference(string owner, string repoName, string reference, CheckSuiteRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
             Ensure.ArgumentNotNullOrEmptyString(reference, nameof(reference));
             Ensure.ArgumentNotNull(request, nameof(request));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var results = await ApiConnection.GetAll<CheckSuitesResponse>(ApiUrls.CheckSuitesForReference(owner, name, reference), request.ToParametersDictionary(), options).ConfigureAwait(false);
+            var results = await ApiConnection.GetAll<CheckSuitesResponse>(ApiUrls.CheckSuitesForReference(owner, repoName, reference), request.ToParametersDictionary(), options).ConfigureAwait(false);
 
             return new CheckSuitesResponse(
                 results.Count > 0 ? results.Max(x => x.TotalCount) : 0,
@@ -185,16 +185,16 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#set-preferences-for-check-suites-on-a-repository">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="preferences">The check suite preferences</param>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/check-suites/preferences")]
-        public Task<CheckSuitePreferencesResponse> UpdatePreferences(string owner, string name, CheckSuitePreferences preferences)
+        public Task<CheckSuitePreferencesResponse> UpdatePreferences(string owner, string repoName, CheckSuitePreferences preferences)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
             Ensure.ArgumentNotNull(preferences, nameof(preferences));
 
-            return ApiConnection.Patch<CheckSuitePreferencesResponse>(ApiUrls.CheckSuitePreferences(owner, name), preferences);
+            return ApiConnection.Patch<CheckSuitePreferencesResponse>(ApiUrls.CheckSuitePreferences(owner, repoName), preferences);
         }
 
         /// <summary>
@@ -220,16 +220,16 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#create-a-check-suite">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="newCheckSuite">Details of the Check Suite to create</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/check-suites")]
-        public Task<CheckSuite> Create(string owner, string name, NewCheckSuite newCheckSuite)
+        public Task<CheckSuite> Create(string owner, string repoName, NewCheckSuite newCheckSuite)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
             Ensure.ArgumentNotNull(newCheckSuite, nameof(newCheckSuite));
 
-            return ApiConnection.Post<CheckSuite>(ApiUrls.CheckSuites(owner, name), newCheckSuite);
+            return ApiConnection.Post<CheckSuite>(ApiUrls.CheckSuites(owner, repoName), newCheckSuite);
         }
 
         /// <summary>
@@ -255,15 +255,15 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/checks/suites/#request-check-suites">Check Suites API documentation</a> for more information.
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
-        /// <param name="name">The name of the repository</param>
+        /// <param name="repoName">The name of the repository</param>
         /// <param name="checkSuiteId">The Id of the check suite</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/check-suites/{2}/rerequest")]
-        public async Task<bool> Rerequest(string owner, string name, long checkSuiteId)
+        public async Task<bool> Rerequest(string owner, string repoName, long checkSuiteId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
-            Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
+            Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
 
-            var httpStatusCode = await Connection.Post(ApiUrls.CheckSuiteRerequest(owner, name, checkSuiteId)).ConfigureAwait(false);
+            var httpStatusCode = await Connection.Post(ApiUrls.CheckSuiteRerequest(owner, repoName, checkSuiteId)).ConfigureAwait(false);
 
             if (httpStatusCode != HttpStatusCode.Created)
             {

Octokit/Clients/CommitCommentReactionsClient.cs

@@ -22,17 +22,17 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         /// <returns></returns>
         [ManualRoute("POST", "/repos/{owner}/{repo}/comments/{comment_id}/reactions")]
-        public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public Task<Reaction> Create(string owner, string name, long commentId, NewReaction 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);
+            return ApiConnection.Post<Reaction>(ApiUrls.CommitCommentReactions(owner, name, commentId), reaction);
         }
 
         /// <summary>
@@ -40,15 +40,15 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         /// <returns></returns>
         [ManualRoute("POST", "/repositories/{id}/comments/{comment_id}/reactions")]
-        public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return ApiConnection.Post<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, number), reaction);
+            return ApiConnection.Post<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, commentId), reaction);
         }
 
         /// <summary>
@@ -57,12 +57,12 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
         [ManualRoute("GET", "/repos/{owner}/{repo}/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId)
         {
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -71,17 +71,17 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
         [ManualRoute("GET", "/repos/{owner}/{repo}/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.CommitCommentReactions(owner, name, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.CommitCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -89,12 +89,12 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
         [ManualRoute("GET", "/repositories/{id}/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -102,15 +102,15 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
         [ManualRoute("GET", "/repositories/{id}/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.CommitCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -123,7 +123,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(string owner, string name, int commentId, int reactionId)
+        public Task Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -140,7 +140,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repositories/{id}/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(long repositoryId, int commentId, int reactionId)
+        public Task Delete(long repositoryId, long commentId, long reactionId)
         {
             return ApiConnection.Delete(ApiUrls.CommitCommentReaction(repositoryId, commentId, reactionId));
         }

Octokit/Clients/Enterprise/EnterprisePreReceiveEnvironmentsClient.cs

@@ -53,13 +53,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/enterprise-admin/pre_receive_environments/#get-a-single-pre-receive-environment">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="environmentId">The id of the pre-receive environment</param>
+        /// <param name="preReceiveEnvironmentId">The id of the pre-receive environment</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="environmentId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveEnvironmentId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/admin/pre-receive-environments/{pre_receive_environment_id}")]
-        public Task<PreReceiveEnvironment> Get(long environmentId)
+        public Task<PreReceiveEnvironment> Get(long preReceiveEnvironmentId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveEnvironments(environmentId);
+            var endpoint = ApiUrls.AdminPreReceiveEnvironments(preReceiveEnvironmentId);
             return ApiConnection.Get<PreReceiveEnvironment>(endpoint, null);
         }
 
@@ -86,16 +86,16 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/enterprise-admin/pre_receive_environments/#edit-a-pre-receive-environment">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="environmentId">The id of the pre-receive environment</param>
+        /// <param name="preReceiveEnvironmentId">The id of the pre-receive environment</param>
         /// <param name="updatePreReceiveEnvironment">A description of the pre-receive environment to edit</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="environmentId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveEnvironmentId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("PATCH", "/admin/pre-receive-environments/{pre_receive_environment_id}")]
-        public Task<PreReceiveEnvironment> Edit(long environmentId, UpdatePreReceiveEnvironment updatePreReceiveEnvironment)
+        public Task<PreReceiveEnvironment> Edit(long preReceiveEnvironmentId, UpdatePreReceiveEnvironment updatePreReceiveEnvironment)
         {
             Ensure.ArgumentNotNull(updatePreReceiveEnvironment, nameof(updatePreReceiveEnvironment));
 
-            var endpoint = ApiUrls.AdminPreReceiveEnvironments(environmentId);
+            var endpoint = ApiUrls.AdminPreReceiveEnvironments(preReceiveEnvironmentId);
             return ApiConnection.Patch<PreReceiveEnvironment>(endpoint, updatePreReceiveEnvironment);
         }
 
@@ -105,13 +105,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/enterprise-admin/pre_receive_environments/#delete-a-pre-receive-environment">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="environmentId">The id of the pre-receive environment</param>
+        /// <param name="preReceiveEnvironmentId">The id of the pre-receive environment</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="environmentId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveEnvironmentId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("DELETE", "/admin/pre-receive-environments/{pre_receive_environment_id}")]
-        public Task Delete(long environmentId)
+        public Task Delete(long preReceiveEnvironmentId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveEnvironments(environmentId);
+            var endpoint = ApiUrls.AdminPreReceiveEnvironments(preReceiveEnvironmentId);
             return ApiConnection.Delete(endpoint, new object());
         }
 
@@ -121,13 +121,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/enterprise-admin/pre_receive_environments/#get-a-pre-receive-environments-download-status">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="environmentId">The id of the pre-receive environment</param>
+        /// <param name="preReceiveEnvironmentId">The id of the pre-receive environment</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="environmentId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveEnvironmentId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/admin/pre-receive-environments/{pre_receive_environment_id}/downloads/latest")]
-        public Task<PreReceiveEnvironmentDownload> DownloadStatus(long environmentId)
+        public Task<PreReceiveEnvironmentDownload> DownloadStatus(long preReceiveEnvironmentId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveEnvironmentDownloadStatus(environmentId);
+            var endpoint = ApiUrls.AdminPreReceiveEnvironmentDownloadStatus(preReceiveEnvironmentId);
             return ApiConnection.Get<PreReceiveEnvironmentDownload>(endpoint, null);
         }
 
@@ -138,13 +138,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/enterprise-admin/pre_receive_environments/#trigger-a-pre-receive-environment-download">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="environmentId">The id of the pre-receive environment</param>
+        /// <param name="preReceiveEnvironmentId">The id of the pre-receive environment</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="environmentId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveEnvironmentId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("POST", "/admin/pre-receive-environments/{pre_receive_environment_id}/downloads")]
-        public Task<PreReceiveEnvironmentDownload> TriggerDownload(long environmentId)
+        public Task<PreReceiveEnvironmentDownload> TriggerDownload(long preReceiveEnvironmentId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveEnvironmentDownload(environmentId);
+            var endpoint = ApiUrls.AdminPreReceiveEnvironmentDownload(preReceiveEnvironmentId);
             return ApiConnection.Post<PreReceiveEnvironmentDownload>(endpoint, new object());
         }
     }

Octokit/Clients/Enterprise/EnterprisePreReceiveHooksClient.cs

@@ -53,13 +53,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://docs.github.com/enterprise-server/rest/reference/enterprise-admin#get-a-pre-receive-hook">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="hookId">The id of the pre-receive hook</param>
+        /// <param name="preReceiveHookId">The id of the pre-receive hook</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="hookId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveHookId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/admin/pre-receive-hooks/{pre_receive_hook_id}")]
-        public Task<PreReceiveHook> Get(long hookId)
+        public Task<PreReceiveHook> Get(long preReceiveHookId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveHooks(hookId);
+            var endpoint = ApiUrls.AdminPreReceiveHooks(preReceiveHookId);
             return ApiConnection.Get<PreReceiveHook>(endpoint, null, AcceptHeaders.StableVersionJson);
         }
 
@@ -86,16 +86,16 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://docs.github.com/enterprise-server/rest/reference/enterprise-admin#update-a-pre-receive-hook">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="hookId">The id of the pre-receive hook</param>
+        /// <param name="preReceiveHookId">The id of the pre-receive hook</param>
         /// <param name="updatePreReceiveHook">A description of the pre-receive hook to edit</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="hookId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveHookId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("PATCH", "/admin/pre-receive-hooks/{pre_receive_hook_id}")]
-        public Task<PreReceiveHook> Edit(long hookId, UpdatePreReceiveHook updatePreReceiveHook)
+        public Task<PreReceiveHook> Edit(long preReceiveHookId, UpdatePreReceiveHook updatePreReceiveHook)
         {
             Ensure.ArgumentNotNull(updatePreReceiveHook, nameof(updatePreReceiveHook));
 
-            var endpoint = ApiUrls.AdminPreReceiveHooks(hookId);
+            var endpoint = ApiUrls.AdminPreReceiveHooks(preReceiveHookId);
             return ApiConnection.Patch<PreReceiveHook>(endpoint, updatePreReceiveHook, AcceptHeaders.StableVersionJson);
         }
 
@@ -105,13 +105,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://docs.github.com/enterprise-server/rest/reference/enterprise-admin#delete-a-pre-receive-hook">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="hookId">The id of the pre-receive hook</param>
+        /// <param name="preReceiveHookId">The id of the pre-receive hook</param>
-        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="hookId"/> does not exist.</exception>
+        /// <exception cref="NotFoundException">Thrown when the specified <paramref name="preReceiveHookId"/> does not exist.</exception>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("DELETE", "/admin/pre-receive-hooks/{pre_receive_hook_id}")]
-        public Task Delete(long hookId)
+        public Task Delete(long preReceiveHookId)
         {
-            var endpoint = ApiUrls.AdminPreReceiveHooks(hookId);
+            var endpoint = ApiUrls.AdminPreReceiveHooks(preReceiveHookId);
             return ApiConnection.Delete(endpoint, new object(), AcceptHeaders.StableVersionJson);
         }
     }

Octokit/Clients/GistCommentsClient.cs

@@ -27,7 +27,7 @@ namespace Octokit
         /// <param name="commentId">The id of the comment</param>
         /// <returns>Task{GistComment}.</returns>
         [ManualRoute("GET", "/gists/{gist_id}/comments/{comment_id}")]
-        public Task<GistComment> Get(string gistId, int commentId)
+        public Task<GistComment> Get(string gistId, long commentId)
         {
             return ApiConnection.Get<GistComment>(ApiUrls.GistComment(gistId, commentId));
         }
@@ -86,7 +86,7 @@ namespace Octokit
         /// <param name="comment">The updated body of the comment</param>
         /// <returns>Task{GistComment}.</returns>
         [ManualRoute("PATCH", "/gists/{gist_id}/comments/{comment_id}")]
-        public Task<GistComment> Update(string gistId, int commentId, string comment)
+        public Task<GistComment> Update(string gistId, long commentId, string comment)
         {
             Ensure.ArgumentNotNullOrEmptyString(comment, nameof(comment));
 
@@ -101,7 +101,7 @@ namespace Octokit
         /// <param name="commentId">The id of the comment</param>
         /// <returns>Task.</returns>
         [ManualRoute("DELETE", "/gists/{gist_id}/comments/{comment_id}")]
-        public Task Delete(string gistId, int commentId)
+        public Task Delete(string gistId, long commentId)
         {
             return ApiConnection.Delete(ApiUrls.GistComment(gistId, commentId));
         }

Octokit/Clients/GistsClient.cs

@@ -30,11 +30,11 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#get-a-single-gist
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("GET", "/gists/{gist_id}")]
-        public Task<Gist> Get(string id)
+        public Task<Gist> Get(string gistId)
         {
-            return ApiConnection.Get<Gist>(ApiUrls.Gist(id));
+            return ApiConnection.Get<Gist>(ApiUrls.Gist(gistId));
         }
 
         /// <summary>
@@ -74,11 +74,11 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#fork-a-gist
         /// </remarks>
-        /// <param name="id">The id of the gist to fork</param>
+        /// <param name="gistId">The id of the gist to fork</param>
         [ManualRoute("POST", "/gists/{gist_id}/forks")]
-        public Task<Gist> Fork(string id)
+        public Task<Gist> Fork(string gistId)
         {
-            return ApiConnection.Post<Gist>(ApiUrls.ForkGist(id), new object());
+            return ApiConnection.Post<Gist>(ApiUrls.ForkGist(gistId), new object());
         }
 
         /// <summary>
@@ -87,13 +87,13 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#delete-a-gist
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("DELETE", "/gists/{gist_id}")]
-        public Task Delete(string id)
+        public Task Delete(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
-            return ApiConnection.Delete(ApiUrls.Gist(id));
+            return ApiConnection.Delete(ApiUrls.Gist(gistId));
         }
 
         /// <summary>
@@ -344,13 +344,13 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#list-gists-commits
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("GET", "/gists/{gist_id}/commits")]
-        public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id)
+        public Task<IReadOnlyList<GistHistory>> GetAllCommits(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
-            return GetAllCommits(id, ApiOptions.None);
+            return GetAllCommits(gistId, ApiOptions.None);
         }
 
         /// <summary>
@@ -359,15 +359,15 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#list-gists-commits
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/gists/{gist_id}/commits")]
-        public Task<IReadOnlyList<GistHistory>> GetAllCommits(string id, ApiOptions options)
+        public Task<IReadOnlyList<GistHistory>> GetAllCommits(string gistId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<GistHistory>(ApiUrls.GistCommits(id), options);
+            return ApiConnection.GetAll<GistHistory>(ApiUrls.GistCommits(gistId), options);
         }
 
         /// <summary>
@@ -376,13 +376,13 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#list-gists-forks
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("GET", "/gists/{gist_id}/forks")]
-        public Task<IReadOnlyList<GistFork>> GetAllForks(string id)
+        public Task<IReadOnlyList<GistFork>> GetAllForks(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
-            return GetAllForks(id, ApiOptions.None);
+            return GetAllForks(gistId, ApiOptions.None);
         }
 
         /// <summary>
@@ -391,15 +391,15 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#list-gists-forks
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/gists/{gist_id}/forks")]
-        public Task<IReadOnlyList<GistFork>> GetAllForks(string id, ApiOptions options)
+        public Task<IReadOnlyList<GistFork>> GetAllForks(string gistId, ApiOptions options)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<GistFork>(ApiUrls.ForkGist(id), options);
+            return ApiConnection.GetAll<GistFork>(ApiUrls.ForkGist(gistId), options);
         }
 
         /// <summary>
@@ -408,12 +408,12 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#delete-a-gist
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         /// <param name="gistUpdate">The update to the gist</param>
         [ManualRoute("PATCH", "/gists/{gist_id}")]
-        public Task<Gist> Edit(string id, GistUpdate gistUpdate)
+        public Task<Gist> Edit(string gistId, GistUpdate gistUpdate)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
             Ensure.ArgumentNotNull(gistUpdate, nameof(gistUpdate));
 
             var filesAsJsonObject = new JsonObject();
@@ -428,7 +428,7 @@ namespace Octokit
                 Files = filesAsJsonObject
             };
 
-            return ApiConnection.Patch<Gist>(ApiUrls.Gist(id), gist);
+            return ApiConnection.Patch<Gist>(ApiUrls.Gist(gistId), gist);
         }
 
         /// <summary>
@@ -437,13 +437,13 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#star-a-gist
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("PUT", "/gists/{gist_id}/star")]
-        public Task Star(string id)
+        public Task Star(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
-            return ApiConnection.Put(ApiUrls.StarGist(id));
+            return ApiConnection.Put(ApiUrls.StarGist(gistId));
         }
 
         /// <summary>
@@ -452,13 +452,13 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#unstar-a-gist
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("DELETE", "/gists/{gist_id}/star")]
-        public Task Unstar(string id)
+        public Task Unstar(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
-            return ApiConnection.Delete(ApiUrls.StarGist(id));
+            return ApiConnection.Delete(ApiUrls.StarGist(gistId));
         }
 
         /// <summary>
@@ -467,15 +467,15 @@ namespace Octokit
         /// <remarks>
         /// http://developer.github.com/v3/gists/#check-if-a-gist-is-starred
         /// </remarks>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
         [ManualRoute("GET", "/gists/{gist_id}/star")]
-        public async Task<bool> IsStarred(string id)
+        public async Task<bool> IsStarred(string gistId)
         {
-            Ensure.ArgumentNotNullOrEmptyString(id, nameof(id));
+            Ensure.ArgumentNotNullOrEmptyString(gistId, nameof(gistId));
 
             try
             {
-                var response = await Connection.Get<object>(ApiUrls.StarGist(id), null, null).ConfigureAwait(false);
+                var response = await Connection.Get<object>(ApiUrls.StarGist(gistId), null, null).ConfigureAwait(false);
                 return response.HttpResponse.IsTrue();
             }
             catch (NotFoundException)

Octokit/Clients/ICommitCommentReactionsClient.cs

@@ -17,20 +17,20 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         /// <returns></returns>
-        Task<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        Task<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         /// <returns></returns>
-        Task<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Get all reactions for a specified Commit Comment
@@ -38,9 +38,9 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Commit Comment
@@ -48,29 +48,29 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// Get all reactions for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Commit Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-commit-comment</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         /// <returns></returns>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -81,7 +81,7 @@ namespace Octokit
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(string owner, string name, int commentId, int reactionId);
+        Task Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -91,6 +91,6 @@ namespace Octokit
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(long repositoryId, int commentId, int reactionId);
+        Task Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit/Clients/IGistCommentsClient.cs

@@ -21,7 +21,7 @@ namespace Octokit
         /// <returns>Task{GistComment}.</returns>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
             Justification = "Method makes a network request")]
-        Task<GistComment> Get(string gistId, int commentId);
+        Task<GistComment> Get(string gistId, long commentId);
 
         /// <summary>
         /// Gets all comments for the gist with the specified id.
@@ -57,7 +57,7 @@ namespace Octokit
         /// <param name="commentId">The id of the comment</param>
         /// <param name="comment">The updated body of the comment</param>
         /// <returns>Task{GistComment}.</returns>
-        Task<GistComment> Update(string gistId, int commentId, string comment);
+        Task<GistComment> Update(string gistId, long commentId, string comment);
 
         /// <summary>
         /// Deletes the comment with the specified gist- and comment id.
@@ -66,6 +66,6 @@ namespace Octokit
         /// <param name="gistId">The id of the gist</param>
         /// <param name="commentId">The id of the comment</param>
         /// <returns>Task.</returns>
-        Task Delete(string gistId, int commentId);
+        Task Delete(string gistId, long commentId);
     }
 }

Octokit/Clients/IIssueCommentReactionsClient.cs

@@ -17,18 +17,18 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        Task<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Get all reactions for a specified Issue Comment
@@ -36,8 +36,8 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Issue Comment
@@ -45,26 +45,26 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// Get all reactions for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Issue Comment
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -75,7 +75,7 @@ namespace Octokit
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(string owner, string name, int commentId, int reactionId);
+        Task Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Commit Comment
@@ -85,6 +85,6 @@ namespace Octokit
         /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(long repositoryId, int commentId, int reactionId);
+        Task Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit/Clients/IIssueCommentsClient.cs

@@ -18,20 +18,20 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<IssueComment> Get(string owner, string name, int id);
+        Task<IssueComment> Get(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single Issue Comment by id.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<IssueComment> Get(long repositoryId, int id);
+        Task<IssueComment> Get(long repositoryId, long commentId);
 
         /// <summary>
         /// Gets Issue Comments for a repository.
@@ -202,18 +202,18 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        Task<IssueComment> Update(string owner, string name, int id, string commentUpdate);
+        Task<IssueComment> Update(string owner, string name, long commentId, string commentUpdate);
 
         /// <summary>
         /// Updates a specified Issue Comment.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        Task<IssueComment> Update(long repositoryId, int id, string commentUpdate);
+        Task<IssueComment> Update(long repositoryId, long commentId, string commentUpdate);
 
         /// <summary>
         /// Deletes the specified Issue Comment
@@ -221,15 +221,15 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task Delete(string owner, string name, int id);
+        Task Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes the specified Issue Comment
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task Delete(long repositoryId, int id);
+        Task Delete(long repositoryId, long commentId);
     }
 }

Octokit/Clients/IIssueReactionsClient.cs

@@ -75,7 +75,7 @@ namespace Octokit
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(string owner, string name, int issueNumber, int reactionId);
+        Task Delete(string owner, string name, int issueNumber, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Issue
@@ -85,6 +85,6 @@ namespace Octokit
         /// <param name="issueNumber">The issue number</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(long repositoryId, int issueNumber, int reactionId);
+        Task Delete(long repositoryId, int issueNumber, long reactionId);
     }
 }

Octokit/Clients/IPullRequestReviewCommentReactionsClient.cs

@@ -17,8 +17,8 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
@@ -26,26 +26,26 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId);
 
         /// <summary>
         /// Get all reactions for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
-        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options);
+        Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options);
 
         /// <summary>
         /// Creates a reaction for a specified Pull Request Review Comment.
@@ -53,18 +53,18 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(string owner, string name, int number, NewReaction reaction);
+        Task<Reaction> Create(string owner, string name, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Creates a reaction for a specified Pull Request Review Comment.
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
-        Task<Reaction> Create(long repositoryId, int number, NewReaction reaction);
+        Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction);
 
         /// <summary>
         /// Deletes a reaction for a specified Pull Request comment
@@ -72,19 +72,19 @@ namespace Octokit
         /// <remarks>https://docs.github.com/rest/reactions#delete-a-pull-request-comment-reaction</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="commentId">The issue id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(string owner, string name, int commentId, int reactionId);
+        Task Delete(string owner, string name, long commentId, long reactionId);
 
         /// <summary>
         /// Deletes a reaction for a specified Pull Request comment
         /// </summary>
         /// <remarks>https://docs.github.com/rest/reactions#delete-a-pull-request-comment-reaction</remarks>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="commentId">The issue id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
-        Task Delete(long repositoryId, int commentId, int reactionId);
+        Task Delete(long repositoryId, long commentId, long reactionId);
     }
 }

Octokit/Clients/IPullRequestReviewCommentsClient.cs

@@ -121,16 +121,16 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        Task<PullRequestReviewComment> GetComment(string owner, string name, int number);
+        Task<PullRequestReviewComment> GetComment(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single pull request review comment by number.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        Task<PullRequestReviewComment> GetComment(long repositoryId, int number);
+        Task<PullRequestReviewComment> GetComment(long repositoryId, long commentId);
 
         /// <summary>
         /// Creates a comment on a pull request review.
@@ -176,18 +176,18 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        Task<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment);
+        Task<PullRequestReviewComment> Edit(string owner, string name, long commentId, PullRequestReviewCommentEdit comment);
 
         /// <summary>
         /// Edits a comment on a pull request review.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
-        Task<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment);
+        Task<PullRequestReviewComment> Edit(long repositoryId, long commentId, PullRequestReviewCommentEdit comment);
 
         /// <summary>
         /// Deletes a comment on a pull request review.
@@ -195,15 +195,15 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        Task Delete(string owner, string name, int number);
+        Task Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes a comment on a pull request review.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
-        Task Delete(long repositoryId, int number);
+        Task Delete(long repositoryId, long commentId);
     }
 }

Octokit/Clients/IRepositoryCommentsClient.cs

@@ -18,20 +18,20 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<CommitComment> Get(string owner, string name, int number);
+        Task<CommitComment> Get(string owner, string name, long commentId);
 
         /// <summary>
         /// Gets a single Repository Comment by number.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [SuppressMessage("Microsoft.Naming", "CA1716:IdentifiersShouldNotMatchKeywords", MessageId = "Get",
              Justification = "Method makes a network request")]
-        Task<CommitComment> Get(long repositoryId, int number);
+        Task<CommitComment> Get(long repositoryId, long commentId);
 
         /// <summary>
         /// Gets Commit Comments for a repository.
@@ -126,18 +126,18 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        Task<CommitComment> Update(string owner, string name, int number, string commentUpdate);
+        Task<CommitComment> Update(string owner, string name, long commentId, string commentUpdate);
 
         /// <summary>
         /// Updates a specified Commit Comment.
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
-        Task<CommitComment> Update(long repositoryId, int number, string commentUpdate);
+        Task<CommitComment> Update(long repositoryId, long commentId, string commentUpdate);
 
         /// <summary>
         /// Deletes the specified Commit Comment
@@ -145,15 +145,15 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task Delete(string owner, string name, int number);
+        Task Delete(string owner, string name, long commentId);
 
         /// <summary>
         /// Deletes the specified Commit Comment
         /// </summary>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
-        Task Delete(long repositoryId, int number);
+        Task Delete(long repositoryId, long commentId);
     }
 }

Octokit/Clients/IssueCommentReactionsClient.cs

@@ -22,16 +22,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/comments/{number}/reactions")]
-        public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public Task<Reaction> Create(string owner, string name, long commentId, NewReaction 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);
+            return ApiConnection.Post<Reaction>(ApiUrls.IssueCommentReactions(owner, name, commentId), reaction);
         }
 
         /// <summary>
@@ -39,14 +39,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repositories/{0}/issues/comments/{number}/reactions")]
-        public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return ApiConnection.Post<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, number), reaction);
+            return ApiConnection.Post<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, commentId), reaction);
         }
 
         /// <summary>
@@ -55,11 +55,11 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/comments/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId)
         {
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -68,16 +68,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/issues/comments/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.IssueCommentReactions(owner, name, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.IssueCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -85,11 +85,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [ManualRoute("GET", "/repositories/{0}/issues/comments/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -97,14 +97,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-an-issue-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{0}/issues/comments/{number}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.IssueCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -117,7 +117,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(string owner, string name, int commentId, int reactionId)
+        public Task Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -134,7 +134,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repositories/{id}/issues/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(long repositoryId, int commentId, int reactionId)
+        public Task Delete(long repositoryId, long commentId, long reactionId)
         {
             return ApiConnection.Delete(ApiUrls.IssueCommentReaction(repositoryId, commentId, reactionId));
         }

Octokit/Clients/IssueCommentsClient.cs

@@ -25,14 +25,14 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/comments/{comment_id}")]
-        public Task<IssueComment> Get(string owner, string name, int id)
+        public Task<IssueComment> Get(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(owner, name, id), null);
+            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(owner, name, commentId), null);
         }
 
         /// <summary>
@@ -40,11 +40,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/issues/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The issue comment id</param>
+        /// <param name="commentId">The issue comment id</param>
         [ManualRoute("GET", "/repositories/{id}/issues/comments/{comment_id}")]
-        public Task<IssueComment> Get(long repositoryId, int id)
+        public Task<IssueComment> Get(long repositoryId, long commentId)
         {
-            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(repositoryId, id), null);
+            return ApiConnection.Get<IssueComment>(ApiUrls.IssueComment(repositoryId, commentId), null);
         }
 
         /// <summary>
@@ -343,7 +343,7 @@ namespace Octokit
         /// <param name="id">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/issues/comments/{id}")]
-        public Task<IssueComment> Update(string owner, string name, int id, string commentUpdate)
+        public Task<IssueComment> Update(string owner, string name, long id, string commentUpdate)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -360,7 +360,7 @@ namespace Octokit
         /// <param name="id">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         [ManualRoute("PATCH", "/repositories/{id}/issues/comments/{number}")]
-        public Task<IssueComment> Update(long repositoryId, int id, string commentUpdate)
+        public Task<IssueComment> Update(long repositoryId, long id, string commentUpdate)
         {
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
@@ -375,7 +375,7 @@ namespace Octokit
         /// <param name="name">The name of the repository</param>
         /// <param name="id">The comment id</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/comments/{id}")]
-        public Task Delete(string owner, string name, int id)
+        public Task Delete(string owner, string name, long id)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -390,7 +390,7 @@ namespace Octokit
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="id">The comment id</param>
         [ManualRoute("DELETE", "/repositories/{id}/issues/comments/{number}")]
-        public Task Delete(long repositoryId, int id)
+        public Task Delete(long repositoryId, long id)
         {
             return ApiConnection.Delete(ApiUrls.IssueComment(repositoryId, id));
         }

Octokit/Clients/IssueReactionsClient.cs

@@ -117,7 +117,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/issues/{issue_number}/reactions/{reaction_id}")]
-        public Task Delete(string owner, string name, int issueNumber, int reactionId)
+        public Task Delete(string owner, string name, int issueNumber, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -134,7 +134,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repositories/{id}/issues/{issue_number}/reactions/{reaction_id}")]
-        public Task Delete(long repositoryId, int issueNumber, int reactionId)
+        public Task Delete(long repositoryId, int issueNumber, long reactionId)
         {
             return ApiConnection.Delete(ApiUrls.IssueReaction(repositoryId, issueNumber, reactionId));
         }

Octokit/Clients/IssuesEventsClient.cs

@@ -23,14 +23,14 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The issue number</param>
+        /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/issues/{issue_number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int number)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(string owner, string name, int issueNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return GetAllForIssue(owner, name, number, ApiOptions.None);
+            return GetAllForIssue(owner, name, issueNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -40,11 +40,11 @@ namespace Octokit
         /// http://developer.github.com/v3/issues/events/#list-events-for-an-issue
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
+        /// <param name="issueNumber">The issue number</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int number)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber)
         {
-            return GetAllForIssue(repositoryId, number, ApiOptions.None);
+            return GetAllForIssue(repositoryId, issueNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -74,14 +74,14 @@ namespace Octokit
         /// http://developer.github.com/v3/issues/events/#list-events-for-an-issue
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The issue number</param>
+        /// <param name="issueNumber">The issue number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/issues/{number}/events")]
-        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<IssueEvent>> GetAllForIssue(long repositoryId, int issueNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(repositoryId, number), null, options);
+            return ApiConnection.GetAll<IssueEvent>(ApiUrls.IssuesEvents(repositoryId, issueNumber), null, options);
         }
 
         /// <summary>

Octokit/Clients/NotificationsClient.cs

@@ -276,48 +276,48 @@ namespace Octokit
         /// <summary>
         /// Retrives a single <see cref="Notification"/> by Id.
         /// </summary>
-        /// <param name="id">The Id of the notification to retrieve.</param>
+        /// <param name="threadId">The Id of the notification to retrieve.</param>
         /// <remarks>http://developer.github.com/v3/activity/notifications/#view-a-single-thread</remarks>
         [ManualRoute("GET", "/notifications/threads/{thread_id}")]
-        public Task<Notification> Get(int id)
+        public Task<Notification> Get(int threadId)
         {
-            return ApiConnection.Get<Notification>(ApiUrls.Notification(id));
+            return ApiConnection.Get<Notification>(ApiUrls.Notification(threadId));
         }
 
         /// <summary>
         /// Marks a single notification as read.
         /// </summary>
-        /// <param name="id">The id of the notification.</param>
+        /// <param name="threadId">The id of the notification.</param>
         /// <remarks>http://developer.github.com/v3/activity/notifications/#mark-a-thread-as-read</remarks>
         [ManualRoute("PATCH", "/notifications/threads/{thread_id}")]
-        public Task MarkAsRead(int id)
+        public Task MarkAsRead(int threadId)
         {
-            return ApiConnection.Patch(ApiUrls.Notification(id));
+            return ApiConnection.Patch(ApiUrls.Notification(threadId));
         }
 
         /// <summary>
         /// Retrives a <see cref="ThreadSubscription"/> for the provided thread id.
         /// </summary>
-        /// <param name="id">The Id of the thread to retrieve subscription status.</param>
+        /// <param name="threadId">The Id of the thread to retrieve subscription status.</param>
         /// <remarks>http://developer.github.com/v3/activity/notifications/#get-a-thread-subscription</remarks>
         [ManualRoute("GET", "/notifications/threads/{thread_id}/subscription")]
-        public Task<ThreadSubscription> GetThreadSubscription(int id)
+        public Task<ThreadSubscription> GetThreadSubscription(int threadId)
         {
-            return ApiConnection.Get<ThreadSubscription>(ApiUrls.NotificationSubscription(id));
+            return ApiConnection.Get<ThreadSubscription>(ApiUrls.NotificationSubscription(threadId));
         }
 
         /// <summary>
         /// Sets the authenticated user's subscription settings for a given thread.
         /// </summary>
-        /// <param name="id">The Id of the thread to update.</param>
+        /// <param name="threadId">The Id of the thread to update.</param>
         /// <param name="threadSubscription">The subscription parameters to set.</param>
         /// <remarks>http://developer.github.com/v3/activity/notifications/#set-a-thread-subscription</remarks>
         [ManualRoute("PUT", "/notifications/threads/{thread_id}/subscription")]
-        public Task<ThreadSubscription> SetThreadSubscription(int id, NewThreadSubscription threadSubscription)
+        public Task<ThreadSubscription> SetThreadSubscription(int threadId, NewThreadSubscription threadSubscription)
         {
             Ensure.ArgumentNotNull(threadSubscription, nameof(threadSubscription));
 
-            return ApiConnection.Put<ThreadSubscription>(ApiUrls.NotificationSubscription(id), threadSubscription);
+            return ApiConnection.Put<ThreadSubscription>(ApiUrls.NotificationSubscription(threadId), threadSubscription);
         }
 
         /// <summary>

Octokit/Clients/ProjectCardsClient.cs

@@ -86,11 +86,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#get-a-project-card">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the card</param>
+        /// <param name="cardId">The id of the card</param>
         [ManualRoute("GET", "/projects/columns/cards/{card_id}")]
-        public Task<ProjectCard> Get(int id)
+        public Task<ProjectCard> Get(int cardId)
         {
-            return ApiConnection.Get<ProjectCard>(ApiUrls.ProjectCard(id), null);
+            return ApiConnection.Get<ProjectCard>(ApiUrls.ProjectCard(cardId), null);
         }
 
         /// <summary>
@@ -115,14 +115,14 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#update-a-project-card">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the card</param>
+        /// <param name="cardId">The id of the card</param>
         /// <param name="projectCardUpdate">New values to update the card with</param>
         [ManualRoute("GET", "/projects/columns/cards/{card_id}")]
-        public Task<ProjectCard> Update(int id, ProjectCardUpdate projectCardUpdate)
+        public Task<ProjectCard> Update(int cardId, ProjectCardUpdate projectCardUpdate)
         {
             Ensure.ArgumentNotNull(projectCardUpdate, nameof(projectCardUpdate));
 
-            return ApiConnection.Patch<ProjectCard>(ApiUrls.ProjectCard(id), projectCardUpdate);
+            return ApiConnection.Patch<ProjectCard>(ApiUrls.ProjectCard(cardId), projectCardUpdate);
         }
 
         /// <summary>
@@ -131,11 +131,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#delete-a-project-card">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the card</param>
+        /// <param name="cardId">The id of the card</param>
         [ManualRoute("DELETE", "/projects/columns/cards/{card_id}")]
-        public async Task<bool> Delete(int id)
+        public async Task<bool> Delete(int cardId)
         {
-            var endpoint = ApiUrls.ProjectCard(id);
+            var endpoint = ApiUrls.ProjectCard(cardId);
 
             try
             {
@@ -154,14 +154,14 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#move-a-project-card">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the card</param>
+        /// <param name="cardId">The id of the card</param>
         /// <param name="position">The position to move the card</param>
         [ManualRoute("POST", "/projects/columns/cards/{card_id}/moves")]
-        public async Task<bool> Move(int id, ProjectCardMove position)
+        public async Task<bool> Move(int cardId, ProjectCardMove position)
         {
             Ensure.ArgumentNotNull(position, nameof(position));
 
-            var endpoint = ApiUrls.ProjectCardMove(id);
+            var endpoint = ApiUrls.ProjectCardMove(cardId);
             try
             {
                 var httpStatusCode = await Connection.Post(endpoint, position, null).ConfigureAwait(false);

Octokit/Clients/ProjectColumnsClient.cs

@@ -52,11 +52,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/projects/columns/#get-a-project-column">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the column</param>
+        /// <param name="columnId">The id of the column</param>
         [ManualRoute("GET", "/projects/columns/{column_id}")]
-        public Task<ProjectColumn> Get(int id)
+        public Task<ProjectColumn> Get(int columnId)
         {
-            return ApiConnection.Get<ProjectColumn>(ApiUrls.ProjectColumn(id), null);
+            return ApiConnection.Get<ProjectColumn>(ApiUrls.ProjectColumn(columnId), null);
         }
 
         /// <summary>
@@ -81,14 +81,14 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/projects/columns/#update-a-project-column">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the column</param>
+        /// <param name="columnId">The id of the column</param>
         /// <param name="projectColumnUpdate">New values to update the column with</param>
         [ManualRoute("PATCH", "/projects/columns/{column_id}")]
-        public Task<ProjectColumn> Update(int id, ProjectColumnUpdate projectColumnUpdate)
+        public Task<ProjectColumn> Update(int columnId, ProjectColumnUpdate projectColumnUpdate)
         {
             Ensure.ArgumentNotNull(projectColumnUpdate, nameof(projectColumnUpdate));
 
-            return ApiConnection.Patch<ProjectColumn>(ApiUrls.ProjectColumn(id), projectColumnUpdate);
+            return ApiConnection.Patch<ProjectColumn>(ApiUrls.ProjectColumn(columnId), projectColumnUpdate);
         }
 
         /// <summary>
@@ -97,11 +97,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/projects/columns/#delete-a-project-column">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the column</param>
+        /// <param name="columnId">The id of the column</param>
         [ManualRoute("DELETE", "/projects/columns/{column_id}")]
-        public async Task<bool> Delete(int id)
+        public async Task<bool> Delete(int columnId)
         {
-            var endpoint = ApiUrls.ProjectColumn(id);
+            var endpoint = ApiUrls.ProjectColumn(columnId);
             try
             {
                 var httpStatusCode = await Connection.Delete(endpoint, new object()).ConfigureAwait(false);
@@ -119,14 +119,14 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#move-a-column">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The id of the column</param>
+        /// <param name="columnId">The id of the column</param>
         /// <param name="position">The position to move the column</param>
         [ManualRoute("POST", "/projects/columns/{column_id}/moves")]
-        public async Task<bool> Move(int id, ProjectColumnMove position)
+        public async Task<bool> Move(int columnId, ProjectColumnMove position)
         {
             Ensure.ArgumentNotNull(position, nameof(position));
 
-            var endpoint = ApiUrls.ProjectColumnMove(id);
+            var endpoint = ApiUrls.ProjectColumnMove(columnId);
             try
             {
                 var httpStatusCode = await Connection.Post(endpoint, position, null).ConfigureAwait(false);

Octokit/Clients/ProjectsClient.cs

@@ -223,11 +223,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#get-a-project">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The Id of the project</param>
+        /// <param name="projectId">The Id of the project</param>
         [ManualRoute("GET", "/projects/{project_id}")]
-        public Task<Project> Get(int id)
+        public Task<Project> Get(int projectId)
         {
-            return ApiConnection.Get<Project>(ApiUrls.Project(id), null);
+            return ApiConnection.Get<Project>(ApiUrls.Project(projectId), null);
         }
 
         // NOTE: I think we're missing a Task<Project> CreateForRepository(owner, name, newProject)
@@ -272,14 +272,14 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#update-a-project">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The Id of the project</param>
+        /// <param name="projectId">The Id of the project</param>
         /// <param name="projectUpdate">The modified project</param>
         [ManualRoute("PATCH", "/project/{project_id}")]
-        public Task<Project> Update(int id, ProjectUpdate projectUpdate)
+        public Task<Project> Update(int projectId, ProjectUpdate projectUpdate)
         {
             Ensure.ArgumentNotNull(projectUpdate, nameof(projectUpdate));
 
-            return ApiConnection.Patch<Project>(ApiUrls.Project(id), projectUpdate);
+            return ApiConnection.Patch<Project>(ApiUrls.Project(projectId), projectUpdate);
         }
 
         /// <summary>
@@ -288,11 +288,11 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/repos/projects/#delete-a-project">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The Id of the project</param>
+        /// <param name="projectId">The Id of the project</param>
         [ManualRoute("DELETE", "/project/{project_id}")]
-        public async Task<bool> Delete(int id)
+        public async Task<bool> Delete(int projectId)
         {
-            var endpoint = ApiUrls.Project(id);
+            var endpoint = ApiUrls.Project(projectId);
 
             try
             {

Octokit/Clients/PullRequestReviewCommentReactionsClient.cs

@@ -22,11 +22,11 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId)
         {
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -35,16 +35,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(string owner, string name, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, commentId), null, options);
         }
 
         /// <summary>
@@ -52,11 +52,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, commentId, ApiOptions.None);
         }
 
         /// <summary>
@@ -64,14 +64,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#list-reactions-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/comments/{comment_id}/reactions")]
-        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<Reaction>> GetAll(long repositoryId, long commentId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, number), null, options);
+            return ApiConnection.GetAll<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, commentId), null, options);
         }
 
         /// <summary>
@@ -80,16 +80,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions")]
-        public Task<Reaction> Create(string owner, string name, int number, NewReaction reaction)
+        public Task<Reaction> Create(string owner, string name, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, number), reaction);
+            return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReactions(owner, name, commentId), reaction);
         }
 
         /// <summary>
@@ -97,14 +97,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/reactions/#create-reaction-for-a-pull-request-review-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction to create</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/comments/{comment_id}/reactions")]
-        public Task<Reaction> Create(long repositoryId, int number, NewReaction reaction)
+        public Task<Reaction> Create(long repositoryId, long commentId, NewReaction reaction)
         {
             Ensure.ArgumentNotNull(reaction, nameof(reaction));
 
-            return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, number), reaction);
+            return ApiConnection.Post<Reaction>(ApiUrls.PullRequestReviewCommentReactions(repositoryId, commentId), reaction);
         }
 
         /// <summary>
@@ -117,7 +117,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(string owner, string name, int commentId, int reactionId)
+        public Task Delete(string owner, string name, long commentId, long reactionId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
@@ -134,7 +134,7 @@ namespace Octokit
         /// <param name="reactionId">The reaction id</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/repositories/{id}/pulls/comments/{comment_id}/reactions/{reaction_id}")]
-        public Task Delete(long repositoryId, int commentId, int reactionId)
+        public Task Delete(long repositoryId, long commentId, long reactionId)
         {
             return ApiConnection.Delete(ApiUrls.PullRequestReviewCommentReaction(repositoryId, commentId, reactionId));
         }

Octokit/Clients/PullRequestReviewCommentsClient.cs

@@ -23,14 +23,14 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#list-comments-on-a-pull-request</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int number)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int pullRequestNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, pullRequestNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -38,11 +38,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#list-comments-on-a-pull-request</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/{number}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, int number)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, int pullRequestNumber)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, pullRequestNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -51,16 +51,16 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#list-comments-on-a-pull-request</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int number, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(string owner, string name, int pullRequestNumber, ApiOptions 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, options);
+            return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(owner, name, pullRequestNumber), null, options);
         }
 
         /// <summary>
@@ -68,14 +68,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#list-comments-on-a-pull-request</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/{number}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAll(long repositoryId, int pullRequestNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(repositoryId, number), options);
+            return ApiConnection.GetAll<PullRequestReviewComment>(ApiUrls.PullRequestReviewComments(repositoryId, pullRequestNumber), options);
         }
 
         /// <summary>
@@ -207,14 +207,14 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/comments/{comment_id}")]
-        public Task<PullRequestReviewComment> GetComment(string owner, string name, int number)
+        public Task<PullRequestReviewComment> GetComment(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return ApiConnection.Get<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(owner, name, number), new Dictionary<string, string>());
+            return ApiConnection.Get<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(owner, name, commentId), new Dictionary<string, string>());
         }
 
         /// <summary>
@@ -222,11 +222,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#get-a-single-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/comments/{number}")]
-        public Task<PullRequestReviewComment> GetComment(long repositoryId, int number)
+        public Task<PullRequestReviewComment> GetComment(long repositoryId, long commentId)
         {
-            return ApiConnection.Get<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(repositoryId, number));
+            return ApiConnection.Get<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(repositoryId, commentId));
         }
 
         /// <summary>
@@ -235,16 +235,16 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#create-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The Pull Request number</param>
+        /// <param name="pullRequestNumber">The Pull Request number</param>
         /// <param name="comment">The comment</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/pulls/{pull_number}/comments")]
-        public async Task<PullRequestReviewComment> Create(string owner, string name, int number, PullRequestReviewCommentCreate comment)
+        public async Task<PullRequestReviewComment> Create(string owner, string name, int pullRequestNumber, PullRequestReviewCommentCreate comment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, number);
+            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, pullRequestNumber);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
 
             if (response.HttpResponse.StatusCode != HttpStatusCode.Created)
@@ -260,14 +260,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#create-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The Pull Request number</param>
+        /// <param name="pullRequestNumber">The Pull Request number</param>
         /// <param name="comment">The comment</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/comments")]
-        public async Task<PullRequestReviewComment> Create(long repositoryId, int number, PullRequestReviewCommentCreate comment)
+        public async Task<PullRequestReviewComment> Create(long repositoryId, int pullRequestNumber, PullRequestReviewCommentCreate comment)
         {
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, number);
+            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, pullRequestNumber);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
 
             if (response.HttpResponse.StatusCode != HttpStatusCode.Created)
@@ -284,16 +284,16 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#create-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="comment">The comment</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/pulls/{pull_number}/comment")]
-        public async Task<PullRequestReviewComment> CreateReply(string owner, string name, int number, PullRequestReviewCommentReplyCreate comment)
+        public async Task<PullRequestReviewComment> CreateReply(string owner, string name, int pullRequestNumber, PullRequestReviewCommentReplyCreate comment)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, number);
+            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, pullRequestNumber);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
 
             if (response.HttpResponse.StatusCode != HttpStatusCode.Created)
@@ -309,14 +309,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#create-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="comment">The comment</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/comments")]
-        public async Task<PullRequestReviewComment> CreateReply(long repositoryId, int number, PullRequestReviewCommentReplyCreate comment)
+        public async Task<PullRequestReviewComment> CreateReply(long repositoryId, int pullRequestNumber, PullRequestReviewCommentReplyCreate comment)
         {
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, number);
+            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, pullRequestNumber);
             var response = await ApiConnection.Connection.Post<PullRequestReviewComment>(endpoint, comment, null, null).ConfigureAwait(false);
 
             if (response.HttpResponse.StatusCode != HttpStatusCode.Created)
@@ -333,16 +333,16 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/pulls/comments/{comment_id}")]
-        public Task<PullRequestReviewComment> Edit(string owner, string name, int number, PullRequestReviewCommentEdit comment)
+        public Task<PullRequestReviewComment> Edit(string owner, string name, long commentId, PullRequestReviewCommentEdit 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);
+            return ApiConnection.Patch<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(owner, name, commentId), comment);
         }
 
         /// <summary>
@@ -350,14 +350,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#edit-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         /// <param name="comment">The edited comment</param>
         [ManualRoute("PATCH", "/repositories/{id}/pulls/comments/{number}")]
-        public Task<PullRequestReviewComment> Edit(long repositoryId, int number, PullRequestReviewCommentEdit comment)
+        public Task<PullRequestReviewComment> Edit(long repositoryId, long commentId, PullRequestReviewCommentEdit comment)
         {
             Ensure.ArgumentNotNull(comment, nameof(comment));
 
-            return ApiConnection.Patch<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(repositoryId, number), comment);
+            return ApiConnection.Patch<PullRequestReviewComment>(ApiUrls.PullRequestReviewComment(repositoryId, commentId), comment);
         }
 
         /// <summary>
@@ -366,14 +366,14 @@ namespace Octokit
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/pulls/comments/{comment_id}")]
-        public Task Delete(string owner, string name, int number)
+        public Task Delete(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return ApiConnection.Delete(ApiUrls.PullRequestReviewComment(owner, name, number));
+            return ApiConnection.Delete(ApiUrls.PullRequestReviewComment(owner, name, commentId));
         }
 
         /// <summary>
@@ -381,11 +381,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>http://developer.github.com/v3/pulls/comments/#delete-a-comment</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request review comment number</param>
+        /// <param name="commentId">The pull request review comment id</param>
         [ManualRoute("DELETE", "/repositories/{id}/pulls/comments/{number}")]
-        public Task Delete(long repositoryId, int number)
+        public Task Delete(long repositoryId, long commentId)
         {
-            return ApiConnection.Delete(ApiUrls.PullRequestReviewComment(repositoryId, number));
+            return ApiConnection.Delete(ApiUrls.PullRequestReviewComment(repositoryId, commentId));
         }
     }
 }

Octokit/Clients/PullRequestReviewsClient.cs

@@ -22,14 +22,14 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews")]
-        public Task<IReadOnlyList<PullRequestReview>> GetAll(string owner, string name, int number)
+        public Task<IReadOnlyList<PullRequestReview>> GetAll(string owner, string name, int pullRequestNumber)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return GetAll(owner, name, number, ApiOptions.None);
+            return GetAll(owner, name, pullRequestNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -37,11 +37,11 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/{number}/reviews")]
-        public Task<IReadOnlyList<PullRequestReview>> GetAll(long repositoryId, int number)
+        public Task<IReadOnlyList<PullRequestReview>> GetAll(long repositoryId, int pullRequestNumber)
         {
-            return GetAll(repositoryId, number, ApiOptions.None);
+            return GetAll(repositoryId, pullRequestNumber, ApiOptions.None);
         }
 
         /// <summary>
@@ -50,16 +50,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews")]
-        public Task<IReadOnlyList<PullRequestReview>> GetAll(string owner, string name, int number, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReview>> GetAll(string owner, string name, int pullRequestNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.PullRequestReviews(owner, name, number);
+            var endpoint = ApiUrls.PullRequestReviews(owner, name, pullRequestNumber);
             return ApiConnection.GetAll<PullRequestReview>(endpoint, null, options);
         }
 
@@ -68,14 +68,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#list-reviews-on-a-pull-request</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/{number}/reviews")]
-        public Task<IReadOnlyList<PullRequestReview>> GetAll(long repositoryId, int number, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReview>> GetAll(long repositoryId, int pullRequestNumber, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.PullRequestReviews(repositoryId, number);
+            var endpoint = ApiUrls.PullRequestReviews(repositoryId, pullRequestNumber);
             return ApiConnection.GetAll<PullRequestReview>(endpoint, options);
         }
 
@@ -85,15 +85,15 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-a-single-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}")]
-        public Task<PullRequestReview> Get(string owner, string name, int number, long reviewId)
+        public Task<PullRequestReview> Get(string owner, string name, int pullRequestNumber, long reviewId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.PullRequestReview(owner, name, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReview(owner, name, pullRequestNumber, reviewId);
             return ApiConnection.Get<PullRequestReview>(endpoint);
         }
 
@@ -102,12 +102,12 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-a-single-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("GET", "/repositories/{id}/pulls/{number}/reviews/{review_id}")]
-        public Task<PullRequestReview> Get(long repositoryId, int number, long reviewId)
+        public Task<PullRequestReview> Get(long repositoryId, int pullRequestNumber, long reviewId)
         {
-            var endpoint = ApiUrls.PullRequestReview(repositoryId, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReview(repositoryId, pullRequestNumber, reviewId);
             return ApiConnection.Get<PullRequestReview>(endpoint);
         }
 
@@ -117,16 +117,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The Pull Request number</param>
+        /// <param name="pullRequestNumber">The Pull Request number</param>
         /// <param name="review">The review</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews")]
-        public Task<PullRequestReview> Create(string owner, string name, int number, PullRequestReviewCreate review)
+        public Task<PullRequestReview> Create(string owner, string name, int pullRequestNumber, PullRequestReviewCreate review)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(review, nameof(review));
 
-            var endpoint = ApiUrls.PullRequestReviews(owner, name, number);
+            var endpoint = ApiUrls.PullRequestReviews(owner, name, pullRequestNumber);
             return ApiConnection.Post<PullRequestReview>(endpoint, review, null, null);
         }
 
@@ -135,14 +135,14 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The Pull Request number</param>
+        /// <param name="pullRequestNumber">The Pull Request number</param>
         /// <param name="review">The review</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/reviews")]
-        public Task<PullRequestReview> Create(long repositoryId, int number, PullRequestReviewCreate review)
+        public Task<PullRequestReview> Create(long repositoryId, int pullRequestNumber, PullRequestReviewCreate review)
         {
             Ensure.ArgumentNotNull(review, nameof(review));
 
-            var endpoint = ApiUrls.PullRequestReviews(repositoryId, number);
+            var endpoint = ApiUrls.PullRequestReviews(repositoryId, pullRequestNumber);
             return ApiConnection.Post<PullRequestReview>(endpoint, review, null, null);
         }
 
@@ -152,15 +152,15 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#delete-a-pending-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}")]
-        public Task Delete(string owner, string name, int number, long reviewId)
+        public Task Delete(string owner, string name, int pullRequestNumber, long reviewId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.PullRequestReview(owner, name, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReview(owner, name, pullRequestNumber, reviewId);
             return ApiConnection.Delete(endpoint);
         }
 
@@ -169,12 +169,12 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#delete-a-pending-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("DELETE", "/repositories/{id}/pulls/{number}/reviews/{review_id}")]
-        public Task Delete(long repositoryId, int number, long reviewId)
+        public Task Delete(long repositoryId, int pullRequestNumber, long reviewId)
         {
-            var endpoint = ApiUrls.PullRequestReview(repositoryId, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReview(repositoryId, pullRequestNumber, reviewId);
             return ApiConnection.Delete(endpoint);
         }
 
@@ -184,17 +184,17 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#dismiss-a-pull-request-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="dismissMessage">The message indicating why the review was dismissed</param>
         [ManualRoute("PUT", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/dismissals")]
-        public Task<PullRequestReview> Dismiss(string owner, string name, int number, long reviewId, PullRequestReviewDismiss dismissMessage)
+        public Task<PullRequestReview> Dismiss(string owner, string name, int pullRequestNumber, long reviewId, PullRequestReviewDismiss dismissMessage)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(dismissMessage, nameof(dismissMessage));
 
-            var endpoint = ApiUrls.PullRequestReviewDismissal(owner, name, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewDismissal(owner, name, pullRequestNumber, reviewId);
             return ApiConnection.Put<PullRequestReview>(endpoint, dismissMessage);
         }
 
@@ -203,15 +203,15 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#dismiss-a-pull-request-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="dismissMessage">The message indicating why the review was dismissed</param>
         [ManualRoute("PUT", "/repositories/{id}/pulls/{number}/reviews/{review_id}/dismissals")]
-        public Task<PullRequestReview> Dismiss(long repositoryId, int number, long reviewId, PullRequestReviewDismiss dismissMessage)
+        public Task<PullRequestReview> Dismiss(long repositoryId, int pullRequestNumber, long reviewId, PullRequestReviewDismiss dismissMessage)
         {
             Ensure.ArgumentNotNull(dismissMessage, nameof(dismissMessage));
 
-            var endpoint = ApiUrls.PullRequestReviewDismissal(repositoryId, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewDismissal(repositoryId, pullRequestNumber, reviewId);
             return ApiConnection.Put<PullRequestReview>(endpoint, dismissMessage);
         }
 
@@ -221,17 +221,17 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#submit-a-pull-request-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="submitMessage">The message and event being submitted for the review</param>
         [ManualRoute("POST", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/events")]
-        public Task<PullRequestReview> Submit(string owner, string name, int number, long reviewId, PullRequestReviewSubmit submitMessage)
+        public Task<PullRequestReview> Submit(string owner, string name, int pullRequestNumber, long reviewId, PullRequestReviewSubmit submitMessage)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(submitMessage, nameof(submitMessage));
 
-            var endpoint = ApiUrls.PullRequestReviewSubmit(owner, name, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewSubmit(owner, name, pullRequestNumber, reviewId);
             return ApiConnection.Post<PullRequestReview>(endpoint, submitMessage, null, null);
         }
 
@@ -240,15 +240,15 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#submit-a-pull-request-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="submitMessage">The message and event being submitted for the review</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/reviews/{review_id}/events")]
-        public Task<PullRequestReview> Submit(long repositoryId, int number, long reviewId, PullRequestReviewSubmit submitMessage)
+        public Task<PullRequestReview> Submit(long repositoryId, int pullRequestNumber, long reviewId, PullRequestReviewSubmit submitMessage)
         {
             Ensure.ArgumentNotNull(submitMessage, nameof(submitMessage));
 
-            var endpoint = ApiUrls.PullRequestReviewSubmit(repositoryId, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewSubmit(repositoryId, pullRequestNumber, reviewId);
             return ApiConnection.Post<PullRequestReview>(endpoint, submitMessage, null, null);
         }
 
@@ -258,12 +258,12 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-comments-for-a-single-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(string owner, string name, int number, long reviewId)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(string owner, string name, int pullRequestNumber, long reviewId)
         {
-            return GetAllComments(owner, name, number, reviewId, ApiOptions.None);
+            return GetAllComments(owner, name, pullRequestNumber, reviewId, ApiOptions.None);
         }
 
         /// <summary>
@@ -271,12 +271,12 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-comments-for-a-single-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/reviews/{review_id}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(long repositoryId, int number, long reviewId)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(long repositoryId, int pullRequestNumber, long reviewId)
         {
-            return GetAllComments(repositoryId, number, reviewId, ApiOptions.None);
+            return GetAllComments(repositoryId, pullRequestNumber, reviewId, ApiOptions.None);
         }
 
         /// <summary>
@@ -285,16 +285,16 @@ namespace Octokit
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-comments-for-a-single-review</remarks>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("GET", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(string owner, string name, int number, long reviewId, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(string owner, string name, int pullRequestNumber, long reviewId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewComments(owner, name, pullRequestNumber, reviewId);
             return ApiConnection.GetAll<PullRequestReviewComment>(endpoint, null, options);
         }
 
@@ -303,13 +303,13 @@ namespace Octokit
         /// </summary>
         /// <remarks>https://developer.github.com/v3/pulls/reviews/#get-comments-for-a-single-review</remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The pull request number</param>
+        /// <param name="pullRequestNumber">The pull request number</param>
         /// <param name="reviewId">The pull request review number</param>
         /// <param name="options">Options for changing the API response</param>
         [ManualRoute("POST", "/repositories/{id}/pulls/{number}/reviews/{review_id}/comments")]
-        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(long repositoryId, int number, long reviewId, ApiOptions options)
+        public Task<IReadOnlyList<PullRequestReviewComment>> GetAllComments(long repositoryId, int pullRequestNumber, long reviewId, ApiOptions options)
         {
-            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, number, reviewId);
+            var endpoint = ApiUrls.PullRequestReviewComments(repositoryId, pullRequestNumber, reviewId);
 
             return ApiConnection.GetAll<PullRequestReviewComment>(endpoint, null, options);
         }

Octokit/Clients/ReleasesClient.cs

@@ -138,15 +138,15 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repos/{owner}/{repo}/releases/{release_id}")]
-        public Task<Release> Get(string owner, string name, int id)
+        public Task<Release> Get(string owner, string name, int releaseId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.Releases(owner, name, id);
+            var endpoint = ApiUrls.Releases(owner, name, releaseId);
             return ApiConnection.Get<Release>(endpoint);
         }
 
@@ -178,12 +178,12 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#get-a-single-release">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repositories/{id}/releases/{id}")]
-        public Task<Release> Get(long repositoryId, int id)
+        public Task<Release> Get(long repositoryId, int releaseId)
         {
-            var endpoint = ApiUrls.Releases(repositoryId, id);
+            var endpoint = ApiUrls.Releases(repositoryId, releaseId);
             return ApiConnection.Get<Release>(endpoint);
         }
 
@@ -286,17 +286,17 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <param name="data">A description of the release to edit</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/releases/{release_id}")]
-        public Task<Release> Edit(string owner, string name, int id, ReleaseUpdate data)
+        public Task<Release> Edit(string owner, string name, int releaseId, ReleaseUpdate data)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(data, nameof(data));
 
-            var endpoint = ApiUrls.Releases(owner, name, id);
+            var endpoint = ApiUrls.Releases(owner, name, releaseId);
             return ApiConnection.Patch<Release>(endpoint, data);
         }
 
@@ -307,15 +307,15 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#edit-a-release">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <param name="data">A description of the release to edit</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("PATCH", "/repositories/{id}/releases/{id}")]
-        public Task<Release> Edit(long repositoryId, int id, ReleaseUpdate data)
+        public Task<Release> Edit(long repositoryId, int releaseId, ReleaseUpdate data)
         {
             Ensure.ArgumentNotNull(data, nameof(data));
 
-            var endpoint = ApiUrls.Releases(repositoryId, id);
+            var endpoint = ApiUrls.Releases(repositoryId, releaseId);
             return ApiConnection.Patch<Release>(endpoint, data);
         }
 
@@ -327,15 +327,15 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the release to delete</param>
+        /// <param name="releaseId">The id of the release to delete</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/releases/{release_id}")]
-        public Task Delete(string owner, string name, int id)
+        public Task Delete(string owner, string name, int releaseId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.Releases(owner, name, id);
+            var endpoint = ApiUrls.Releases(owner, name, releaseId);
             return ApiConnection.Delete(endpoint);
         }
 
@@ -346,12 +346,12 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#delete-a-release">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release to delete</param>
+        /// <param name="releaseId">The id of the release to delete</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("DELETE", "/repositories/{id}/releases/{id}")]
-        public Task Delete(long repositoryId, int id)
+        public Task Delete(long repositoryId, int releaseId)
         {
-            var endpoint = ApiUrls.Releases(repositoryId, id);
+            var endpoint = ApiUrls.Releases(repositoryId, releaseId);
             return ApiConnection.Delete(endpoint);
         }
 
@@ -363,15 +363,15 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the <see cref="Release"/>.</param>
+        /// <param name="releaseId">The id of the <see cref="Release"/>.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repos/{owner}/{repo}/releases/{release_id}/assets")]
-        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int id)
+        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int releaseId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return GetAllAssets(owner, name, id, ApiOptions.None);
+            return GetAllAssets(owner, name, releaseId, ApiOptions.None);
         }
 
         /// <summary>
@@ -381,12 +381,12 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#list-assets-for-a-release">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the <see cref="Release"/>.</param>
+        /// <param name="releaseId">The id of the <see cref="Release"/>.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repositories/{id}/releases/{id}/assets")]
-        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int id)
+        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int releaseId)
         {
-            return GetAllAssets(repositoryId, id, ApiOptions.None);
+            return GetAllAssets(repositoryId, releaseId, ApiOptions.None);
         }
 
         /// <summary>
@@ -397,17 +397,17 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the <see cref="Release"/>.</param>
+        /// <param name="releaseId">The id of the <see cref="Release"/>.</param>
         /// <param name="options">Options for changing the API response</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repos/{owner}/{repo}/releases/{release_id}/assets")]
-        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int id, ApiOptions options)
+        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(string owner, string name, int releaseId, ApiOptions options)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.ReleaseAssets(owner, name, id);
+            var endpoint = ApiUrls.ReleaseAssets(owner, name, releaseId);
             return ApiConnection.GetAll<ReleaseAsset>(endpoint, null, AcceptHeaders.StableVersion, options);
         }
 
@@ -418,15 +418,15 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#list-assets-for-a-release">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the <see cref="Release"/>.</param>
+        /// <param name="releaseId">The id of the <see cref="Release"/>.</param>
         /// <param name="options">Options for changing the API response</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         [ManualRoute("GET", "/repositories/{id}/releases/{id}/assets")]
-        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int id, ApiOptions options)
+        public Task<IReadOnlyList<ReleaseAsset>> GetAllAssets(long repositoryId, int releaseId, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.ReleaseAssets(repositoryId, id);
+            var endpoint = ApiUrls.ReleaseAssets(repositoryId, releaseId);
             return ApiConnection.GetAll<ReleaseAsset>(endpoint, null, AcceptHeaders.StableVersion, options);
         }
 
@@ -548,14 +548,14 @@ namespace Octokit
         /// </remarks>
         /// <param name="owner">The repository's owner</param>
         /// <param name="name">The repository's name</param>
-        /// <param name="id">The id of the <see cref="ReleaseAsset"/>.</param>
+        /// <param name="assetId">The id of the <see cref="ReleaseAsset"/>.</param>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/releases/assets/{asset_id}")]
-        public Task DeleteAsset(string owner, string name, int id)
+        public Task DeleteAsset(string owner, string name, int assetId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            var endpoint = ApiUrls.Asset(owner, name, id);
+            var endpoint = ApiUrls.Asset(owner, name, assetId);
             return ApiConnection.Delete(endpoint);
         }
 
@@ -566,11 +566,11 @@ namespace Octokit
         /// See the <a href="http://developer.github.com/v3/repos/releases/#delete-a-release-asset">API documentation</a> for more information.
         /// </remarks>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the <see cref="ReleaseAsset"/>.</param>
+        /// <param name="assetId">The id of the <see cref="ReleaseAsset"/>.</param>
         [ManualRoute("DELETE", "/repositories/{id}/releases/assets/{asset_id}")]
-        public Task DeleteAsset(long repositoryId, int id)
+        public Task DeleteAsset(long repositoryId, int assetId)
         {
-            var endpoint = ApiUrls.Asset(repositoryId, id);
+            var endpoint = ApiUrls.Asset(repositoryId, assetId);
             return ApiConnection.Delete(endpoint);
         }
     }

Octokit/Clients/RepositoryCommentsClient.cs

@@ -25,27 +25,27 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         [ManualRoute("GET", "/repos/{owner}/{repo}/comments/{comment_id}")]
-        public Task<CommitComment> Get(string owner, string name, int number)
+        public Task<CommitComment> Get(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return ApiConnection.Get<CommitComment>(ApiUrls.CommitComment(owner, name, number), null);
+            return ApiConnection.Get<CommitComment>(ApiUrls.CommitComment(owner, name, commentId), null);
         }
 
         /// <summary>
         /// Gets a single Repository Comment by number.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#get-a-single-commit-comment</remarks>
         [ManualRoute("GET", "/repositories/{id}/comments/{number}")]
-        public Task<CommitComment> Get(long repositoryId, int number)
+        public Task<CommitComment> Get(long repositoryId, long commentId)
         {
-            return ApiConnection.Get<CommitComment>(ApiUrls.CommitComment(repositoryId, number), null);
+            return ApiConnection.Get<CommitComment>(ApiUrls.CommitComment(repositoryId, commentId), null);
         }
 
         /// <summary>
@@ -211,32 +211,32 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         [ManualRoute("PATCH", "/repos/{owner}/{repo}/comments/{comment_id}")]
-        public Task<CommitComment> Update(string owner, string name, int number, string commentUpdate)
+        public Task<CommitComment> Update(string owner, string name, long  commentId, string 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));
+            return ApiConnection.Patch<CommitComment>(ApiUrls.CommitComment(owner, name, commentId), new BodyWrapper(commentUpdate));
         }
 
         /// <summary>
         /// Updates a specified Commit Comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="commentUpdate">The modified comment</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#update-a-commit-comment</remarks>
         [ManualRoute("PATCH", "/repositories/{id}/comments/{number}")]
-        public Task<CommitComment> Update(long repositoryId, int number, string commentUpdate)
+        public Task<CommitComment> Update(long repositoryId, long commentId, string commentUpdate)
         {
             Ensure.ArgumentNotNull(commentUpdate, nameof(commentUpdate));
 
-            return ApiConnection.Patch<CommitComment>(ApiUrls.CommitComment(repositoryId, number), new BodyWrapper(commentUpdate));
+            return ApiConnection.Patch<CommitComment>(ApiUrls.CommitComment(repositoryId, commentId), new BodyWrapper(commentUpdate));
         }
 
         /// <summary>
@@ -244,27 +244,27 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         [ManualRoute("DELETE", "/repos/{owner}/{repo}/comments/{comment_id}")]
-        public Task Delete(string owner, string name, int number)
+        public Task Delete(string owner, string name, long commentId)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(name, nameof(name));
 
-            return ApiConnection.Delete(ApiUrls.CommitComment(owner, name, number));
+            return ApiConnection.Delete(ApiUrls.CommitComment(owner, name, commentId));
         }
 
         /// <summary>
         /// Deletes the specified Commit Comment
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <remarks>http://developer.github.com/v3/repos/comments/#delete-a-commit-comment</remarks>
         [ManualRoute("DELETE", "/repositories/{id}/comments/{number}")]
-        public Task Delete(long repositoryId, int number)
+        public Task Delete(long repositoryId, long commentId)
         {
-            return ApiConnection.Delete(ApiUrls.CommitComment(repositoryId, number));
+            return ApiConnection.Delete(ApiUrls.CommitComment(repositoryId, commentId));
         }
     }
 }

Octokit/Clients/TeamsClient.cs

@@ -28,12 +28,12 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#get-team
         /// </remarks>
-        /// <param name="id">The team identifier.</param>
+        /// <param name="teamSlug">The team identifier.</param>
         /// <returns>The <see cref="Team"/> with the given identifier.</returns>
         [ManualRoute("GET", "/teams/{team_id}")]
-        public Task<Team> Get(int id)
+        public Task<Team> Get(int teamSlug)
         {
-            var endpoint = ApiUrls.Teams(id);
+            var endpoint = ApiUrls.Teams(teamSlug);
 
             return ApiConnection.Get<Team>(endpoint);
         }
@@ -97,14 +97,14 @@ namespace Octokit
         /// <summary>
         /// Returns all child teams of the given team.
         /// </summary>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-child-teams
         /// </remarks>
         [ManualRoute("GET", "/teams{id}/teams")]
-        public Task<IReadOnlyList<Team>> GetAllChildTeams(int id)
+        public Task<IReadOnlyList<Team>> GetAllChildTeams(int teamSlug)
         {
-            return GetAllChildTeams(id, ApiOptions.None);
+            return GetAllChildTeams(teamSlug, ApiOptions.None);
         }
 
         /// <summary>
@@ -113,14 +113,14 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-child-teams
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="options">Options to change API behaviour.</param>
         [ManualRoute("GET", "/teams{id}/teams")]
-        public Task<IReadOnlyList<Team>> GetAllChildTeams(int id, ApiOptions options)
+        public Task<IReadOnlyList<Team>> GetAllChildTeams(int teamSlug, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.TeamChildTeams(id);
+            var endpoint = ApiUrls.TeamChildTeams(teamSlug);
 
             return ApiConnection.GetAll<Team>(endpoint, options);
         }
@@ -131,11 +131,11 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-team-members
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         [ManualRoute("GET", "/teams{id}/members")]
-        public Task<IReadOnlyList<User>> GetAllMembers(int id)
+        public Task<IReadOnlyList<User>> GetAllMembers(int teamSlug)
         {
-            return GetAllMembers(id, ApiOptions.None);
+            return GetAllMembers(teamSlug, ApiOptions.None);
         }
 
         /// <summary>
@@ -144,14 +144,14 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-team-members
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="options">Options to change API behaviour.</param>
         [ManualRoute("GET", "/teams{id}/members")]
-        public Task<IReadOnlyList<User>> GetAllMembers(int id, ApiOptions options)
+        public Task<IReadOnlyList<User>> GetAllMembers(int teamSlug, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.TeamMembers(id);
+            var endpoint = ApiUrls.TeamMembers(teamSlug);
 
             return ApiConnection.GetAll<User>(endpoint, options);
         }
@@ -162,14 +162,14 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-team-members
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="request">The request filter</param>
         [ManualRoute("GET", "/teams{id}/members")]
-        public Task<IReadOnlyList<User>> GetAllMembers(int id, TeamMembersRequest request)
+        public Task<IReadOnlyList<User>> GetAllMembers(int teamSlug, TeamMembersRequest request)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
 
-            return GetAllMembers(id, request, ApiOptions.None);
+            return GetAllMembers(teamSlug, request, ApiOptions.None);
         }
 
         /// <summary>
@@ -178,36 +178,36 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/orgs/teams/#list-team-members
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="request">The request filter</param>
         /// <param name="options">Options to change API behaviour.</param>
         [ManualRoute("GET", "/teams{id}/members")]
-        public Task<IReadOnlyList<User>> GetAllMembers(int id, TeamMembersRequest request, ApiOptions options)
+        public Task<IReadOnlyList<User>> GetAllMembers(int teamSlug, TeamMembersRequest request, ApiOptions options)
         {
             Ensure.ArgumentNotNull(request, nameof(request));
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.TeamMembers(id);
+            var endpoint = ApiUrls.TeamMembers(teamSlug);
 
             return ApiConnection.GetAll<User>(endpoint, request.ToParametersDictionary(), options);
         }
 
         /// <summary>
         /// Gets whether the user with the given <paramref name="login"/>
-        /// is a member of the team with the given <paramref name="id"/>.
+        /// is a member of the team with the given <paramref name="teamSlug"/>.
         /// A <see cref="NotFoundException"/> is thrown if the user is not a member.
         /// </summary>
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/orgs/teams/#get-team-membership">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The team to check.</param>
+        /// <param name="teamSlug">The team to check.</param>
         /// <param name="login">The user to check.</param>
         [ManualRoute("GET", "/teams/{team_id}/memberships/{username}")]
-        public Task<TeamMembershipDetails> GetMembershipDetails(int id, string login)
+        public Task<TeamMembershipDetails> GetMembershipDetails(int teamSlug, string login)
         {
             Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
-            var endpoint = ApiUrls.TeamMember(id, login);
+            var endpoint = ApiUrls.TeamMember(teamSlug, login);
 
             return ApiConnection.Get<TeamMembershipDetails>(endpoint);
         }
@@ -260,11 +260,11 @@ namespace Octokit
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>Updated <see cref="Team"/></returns>
         [ManualRoute("PATCH", "/teams/{team_id}")]
-        public Task<Team> Update(int id, UpdateTeam team)
+        public Task<Team> Update(int teamSlug, UpdateTeam team)
         {
             Ensure.ArgumentNotNull(team, nameof(team));
 
-            var endpoint = ApiUrls.Teams(id);
+            var endpoint = ApiUrls.Teams(teamSlug);
             return ApiConnection.Patch<Team>(endpoint, team);
         }
 
@@ -299,13 +299,13 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://docs.github.com/en/rest/teams/teams?apiVersion=2022-11-28#delete-a-team-legacy">API documentation</a> 
         /// </remarks>
-        /// <param name="id">The unique identifier of the team.</param>
+        /// <param name="teamSlug">The unique identifier of the team.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>
         [ManualRoute("DELETE", "/teams/{team_id}")]
-        public Task Delete(int id)
+        public Task Delete(int teamSlug)
         {
-            var endpoint = ApiUrls.Teams(id);
+            var endpoint = ApiUrls.Teams(teamSlug);
 
             return ApiConnection.Delete(endpoint);
         }
@@ -316,16 +316,16 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/orgs/teams/#add-or-update-team-membership">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The team identifier.</param>
+        /// <param name="teamSlug">The team identifier.</param>
         /// <param name="login">The user to add to the team.</param>
         /// <param name="request">Additional parameters for the request</param>
         [ManualRoute("PUT", "/teams/{team_id}/memberships/{username}")]
-        public Task<TeamMembershipDetails> AddOrEditMembership(int id, string login, UpdateTeamMembership request)
+        public Task<TeamMembershipDetails> AddOrEditMembership(int teamSlug, string login, UpdateTeamMembership request)
         {
             Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
             Ensure.ArgumentNotNull(request, nameof(request));
 
-            var endpoint = ApiUrls.TeamMember(id, login);
+            var endpoint = ApiUrls.TeamMember(teamSlug, login);
 
             return ApiConnection.Put<TeamMembershipDetails>(endpoint, request);
         }
@@ -336,15 +336,15 @@ namespace Octokit
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/orgs/teams/#remove-team-member">API documentation</a> for more information.
         /// </remarks>
-        /// <param name="id">The team identifier.</param>
+        /// <param name="teamSlug">The team identifier.</param>
         /// <param name="login">The user to remove from the team.</param>
         /// <returns><see langword="true"/> if the user was removed from the team; <see langword="false"/> otherwise.</returns>
         [ManualRoute("DELETE", "/teams/{team_id}/memberships/{username}")]
-        public async Task<bool> RemoveMembership(int id, string login)
+        public async Task<bool> RemoveMembership(int teamSlug, string login)
         {
             Ensure.ArgumentNotNullOrEmptyString(login, nameof(login));
 
-            var endpoint = ApiUrls.TeamMember(id, login);
+            var endpoint = ApiUrls.TeamMember(teamSlug, login);
 
             try
             {
@@ -361,28 +361,28 @@ namespace Octokit
         /// <summary>
         /// Returns all team's repositories.
         /// </summary>
-        /// <param name="id">Team Id.</param>
+        /// <param name="teamSlug">Team Id.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>The team's repositories</returns>
         [ManualRoute("GET", "/teams/{team_id}/repos")]
-        public Task<IReadOnlyList<Repository>> GetAllRepositories(int id)
+        public Task<IReadOnlyList<Repository>> GetAllRepositories(int teamSlug)
         {
-            return GetAllRepositories(id, ApiOptions.None);
+            return GetAllRepositories(teamSlug, ApiOptions.None);
         }
 
         /// <summary>
         /// Returns all team's repositories.
         /// </summary>
-        /// <param name="id">Team Id.</param>
+        /// <param name="teamSlug">Team Id.</param>
         /// <param name="options">Options to change API behaviour.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns>The team's repositories</returns>
         [ManualRoute("GET", "/teams/{team_id}/repos")]
-        public Task<IReadOnlyList<Repository>> GetAllRepositories(int id, ApiOptions options)
+        public Task<IReadOnlyList<Repository>> GetAllRepositories(int teamSlug, ApiOptions options)
         {
             Ensure.ArgumentNotNull(options, nameof(options));
 
-            var endpoint = ApiUrls.TeamRepositories(id);
+            var endpoint = ApiUrls.TeamRepositories(teamSlug);
 
             return ApiConnection.GetAll<Repository>(endpoint, options);
         }
@@ -395,7 +395,7 @@ namespace Octokit
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>
         [ManualRoute("PUT", "/teams/{team_id}/repos/{owner}/{repo}")]
-        public async Task<bool> AddRepository(int id, string organization, string repoName)
+        public async Task<bool> AddRepository(int teamSlug, string organization, string repoName)
         {
             Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
             Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
@@ -412,7 +412,7 @@ namespace Octokit
             //
             // Likely will require a breaking change
 
-            var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
+            var endpoint = ApiUrls.TeamRepository(teamSlug, organization, repoName);
 
             try
             {
@@ -430,14 +430,14 @@ namespace Octokit
         /// Deprecation Notice: This endpoint route is deprecated and will be removed from the Teams API.
         /// We recommend migrating your existing code to use the new "Add or update team repository permissions" endpoint.
         /// </summary>
-        /// <param name="id">The team identifier.</param>
+        /// <param name="teamSlug">The team identifier.</param>
         /// <param name="organization">Org to associate the repo with.</param>
         /// <param name="repoName">Name of the repo.</param>
         /// <param name="permission">The permission to grant the team on this repository.</param>
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>
         [ManualRoute("PUT", "/teams/{team_id}/repos/{owner}/{repo}")]
-        public async Task<bool> AddRepository(int id, string organization, string repoName, RepositoryPermissionRequest permission)
+        public async Task<bool> AddRepository(int teamSlug, string organization, string repoName, RepositoryPermissionRequest permission)
         {
             Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
             Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
@@ -454,7 +454,7 @@ namespace Octokit
             //
             // Likely will require a breaking change
 
-            var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
+            var endpoint = ApiUrls.TeamRepository(teamSlug, organization, repoName);
 
             try
             {
@@ -475,7 +475,7 @@ namespace Octokit
         /// <exception cref="ApiException">Thrown when a general API error occurs.</exception>
         /// <returns></returns>
         [ManualRoute("DELETE", "/teams/{team_id}/repos/{owner}/{repo}")]
-        public async Task<bool> RemoveRepository(int id, string organization, string repoName)
+        public async Task<bool> RemoveRepository(int teamSlug, string organization, string repoName)
         {
             Ensure.ArgumentNotNullOrEmptyString(organization, nameof(organization));
             Ensure.ArgumentNotNullOrEmptyString(repoName, nameof(repoName));
@@ -492,7 +492,7 @@ namespace Octokit
             //
             // Likely will require a breaking change
 
-            var endpoint = ApiUrls.TeamRepository(id, organization, repoName);
+            var endpoint = ApiUrls.TeamRepository(teamSlug, organization, repoName);
 
             try
             {
@@ -509,7 +509,7 @@ namespace Octokit
         /// <summary>
         /// Gets whether or not the given repository is managed by the given team.
         /// </summary>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="owner">Owner of the org the team is associated with.</param>
         /// <param name="repo">Name of the repo.</param>
         /// <remarks>
@@ -517,12 +517,12 @@ namespace Octokit
         /// </remarks>
         /// <returns><see langword="true"/> if the repository is managed by the given team; <see langword="false"/> otherwise.</returns>
         [ManualRoute("GET", "/teams/{team_id}/repos/{owner}/{name}")]
-        public async Task<bool> IsRepositoryManagedByTeam(int id, string owner, string repo)
+        public async Task<bool> IsRepositoryManagedByTeam(int teamSlug, string owner, string repo)
         {
             Ensure.ArgumentNotNullOrEmptyString(owner, nameof(owner));
             Ensure.ArgumentNotNullOrEmptyString(repo, nameof(repo));
 
-            var endpoint = ApiUrls.TeamRepository(id, owner, repo);
+            var endpoint = ApiUrls.TeamRepository(teamSlug, owner, repo);
 
             try
             {
@@ -542,14 +542,14 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/orgs/teams/#list-pending-team-invitations">API Documentation</a>
         /// for more information.
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <returns></returns>
         [ManualRoute("GET", "/teams/{team_id}/invitations")]
-        public Task<IReadOnlyList<OrganizationMembershipInvitation>> GetAllPendingInvitations(int id)
+        public Task<IReadOnlyList<OrganizationMembershipInvitation>> GetAllPendingInvitations(int teamSlug)
         {
-            Ensure.ArgumentNotNull(id, nameof(id));
+            Ensure.ArgumentNotNull(teamSlug, nameof(teamSlug));
 
-            return GetAllPendingInvitations(id, ApiOptions.None);
+            return GetAllPendingInvitations(teamSlug, ApiOptions.None);
         }
 
         /// <summary>
@@ -559,13 +559,13 @@ namespace Octokit
         /// See the <a href="https://developer.github.com/v3/orgs/teams/#list-pending-team-invitations">API Documentation</a>
         /// for more information.
         /// </remarks>
-        /// <param name="id">The team identifier</param>
+        /// <param name="teamSlug">The team identifier</param>
         /// <param name="options">Options to change API behaviour</param>
         /// <returns></returns>
         [ManualRoute("GET", "/teams/{team_id}/invitations")]
-        public Task<IReadOnlyList<OrganizationMembershipInvitation>> GetAllPendingInvitations(int id, ApiOptions options)
+        public Task<IReadOnlyList<OrganizationMembershipInvitation>> GetAllPendingInvitations(int teamSlug, ApiOptions options)
         {
-            return ApiConnection.GetAll<OrganizationMembershipInvitation>(ApiUrls.TeamPendingInvitations(id), null, options);
+            return ApiConnection.GetAll<OrganizationMembershipInvitation>(ApiUrls.TeamPendingInvitations(teamSlug), null, options);
         }
 
         /// <summary>

Octokit/Clients/UserGpgKeysClient.cs

@@ -53,15 +53,15 @@ namespace Octokit
         /// <summary>
         /// View extended details of the <see cref="GpgKey"/> for the specified id.
         /// </summary>
-        /// <param name="id">The Id of the GPG key</param>
+        /// <param name="gpgKeyId">The Id of the GPG key</param>
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/users/gpg_keys/#get-a-single-gpg-key">API documentation</a> for more information.
         /// </remarks>
         /// <returns>The <see cref="GpgKey"/> for the specified Id.</returns>
         [ManualRoute("GET", "/user/gpg_keys/{gpg_key_id}")]
-        public Task<GpgKey> Get(int id)
+        public Task<GpgKey> Get(int gpgKeyId)
         {
-            return ApiConnection.Get<GpgKey>(ApiUrls.GpgKeys(id));
+            return ApiConnection.Get<GpgKey>(ApiUrls.GpgKeys(gpgKeyId));
         }
 
         /// <summary>
@@ -83,15 +83,15 @@ namespace Octokit
         /// <summary>
         /// Deletes the GPG key for the specified Id.
         /// </summary>
-        /// <param name="id">The Id of the GPG key to delete.</param>
+        /// <param name="gpgKeyId">The Id of the GPG key to delete.</param>
         /// <remarks>
         /// See the <a href="https://developer.github.com/v3/users/gpg_keys/#delete-a-gpg-key">API documentation</a> for more information.
         /// </remarks>
         /// <returns></returns>
         [ManualRoute("DELETE", "/user/gpg_keys/{gpg_key_id}")]
-        public Task Delete(int id)
+        public Task Delete(int gpgKeyId)
         {
-            return ApiConnection.Delete(ApiUrls.GpgKeys(id));
+            return ApiConnection.Delete(ApiUrls.GpgKeys(gpgKeyId));
         }
     }
 }

Octokit/Clients/UserKeysClient.cs

@@ -85,12 +85,12 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/users/keys/#get-a-single-public-key
         /// </remarks>
-        /// <param name="id">The Id of the SSH key</param>
+        /// <param name="keyId">The Id of the SSH key</param>
         /// <returns></returns>
         [ManualRoute("GET", "/user/keys/{key_id}")]
-        public Task<PublicKey> Get(int id)
+        public Task<PublicKey> Get(int keyId)
         {
-            return ApiConnection.Get<PublicKey>(ApiUrls.Keys(id));
+            return ApiConnection.Get<PublicKey>(ApiUrls.Keys(keyId));
         }
 
         /// <summary>
@@ -115,12 +115,12 @@ namespace Octokit
         /// <remarks>
         /// https://developer.github.com/v3/users/keys/#delete-a-public-key
         /// </remarks>
-        /// <param name="id">The id of the key to delete</param>
+        /// <param name="keyId">The id of the key to delete</param>
         /// <returns></returns>
         [ManualRoute("DELETE", "/user/keys/{key_id}")]
-        public Task Delete(int id)
+        public Task Delete(int keyId)
         {
-            return ApiConnection.Delete(ApiUrls.Keys(id));
+            return ApiConnection.Delete(ApiUrls.Keys(keyId));
         }
     }
 }

Octokit/Helpers/ApiUrls.cs

@@ -232,10 +232,10 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> to retrieve a given key.
         /// </summary>
-        /// <param name="id">The Key Id to retrieve</param>
+        /// <param name="keyId">The Key Id to retrieve</param>
-        public static Uri Keys(int id)
+        public static Uri Keys(int keyId)
         {
-            return "user/keys/{0}".FormatUri(id);
+            return "user/keys/{0}".FormatUri(keyId);
         }
 
         /// <summary>
@@ -274,11 +274,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <returns></returns>
-        public static Uri Releases(string owner, string name, int id)
+        public static Uri Releases(string owner, string name, int releaseId)
         {
-            return "repos/{0}/{1}/releases/{2}".FormatUri(owner, name, id);
+            return "repos/{0}/{1}/releases/{2}".FormatUri(owner, name, releaseId);
         }
 
         /// <summary>
@@ -309,11 +309,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <returns></returns>
-        public static Uri ReleaseAssets(string owner, string name, int id)
+        public static Uri ReleaseAssets(string owner, string name, int releaseId)
         {
-            return "repos/{0}/{1}/releases/{2}/assets".FormatUri(owner, name, id);
+            return "repos/{0}/{1}/releases/{2}/assets".FormatUri(owner, name, releaseId);
         }
 
         /// <summary>
@@ -321,11 +321,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The id of the release asset</param>
+        /// <param name="releaseAssetId">The id of the release asset</param>
         /// <returns></returns>
-        public static Uri Asset(string owner, string name, int id)
+        public static Uri Asset(string owner, string name, int releaseAssetId)
         {
-            return "repos/{0}/{1}/releases/assets/{2}".FormatUri(owner, name, id);
+            return "repos/{0}/{1}/releases/assets/{2}".FormatUri(owner, name, releaseAssetId);
         }
 
         /// <summary>
@@ -352,20 +352,20 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> for the specified notification.
         /// </summary>
-        /// <param name="id">The Id of the notification.</param>
+        /// <param name="notificationId">The Id of the notification.</param>
         /// <returns></returns>
-        public static Uri Notification(int id)
+        public static Uri Notification(int notificationId)
         {
-            return "notifications/threads/{0}".FormatUri(id);
+            return "notifications/threads/{0}".FormatUri(notificationId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the specified notification's subscription status.
         /// </summary>
-        /// <param name="id">The Id of the notification.</param>
+        /// <param name="notificationId">The Id of the notification.</param>
-        public static Uri NotificationSubscription(int id)
+        public static Uri NotificationSubscription(int notificationId)
         {
-            return "notifications/threads/{0}/subscription".FormatUri(id);
+            return "notifications/threads/{0}/subscription".FormatUri(notificationId);
         }
 
         /// <summary>
@@ -563,11 +563,11 @@ namespace Octokit
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
         /// <param name="number">The issue number</param>
-        /// <param name="reaction">The reactionid for the issue</param>
+        /// <param name="reactionId">The reactionid for the issue</param>
         /// <returns></returns>
-        public static Uri IssueReaction(string owner, string name, int number, int reaction)
+        public static Uri IssueReaction(string owner, string name, int number, long reactionId)
         {
-            return "repos/{0}/{1}/issues/{2}/reactions/{3}".FormatUri(owner, name, number, reaction);
+            return "repos/{0}/{1}/issues/{2}/reactions/{3}".FormatUri(owner, name, number, reactionId);
         }
 
         /// <summary>
@@ -575,11 +575,11 @@ namespace Octokit
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
         /// <param name="number">The issue number</param>
-        /// <param name="reaction">The reactionid for the issue</param>
+        /// <param name="reactionId">The reactionid for the issue</param>
         /// <returns></returns>
-        public static Uri IssueReaction(long repositoryId, int number, int reaction)
+        public static Uri IssueReaction(long repositoryId, int number, long reactionId)
         {
-            return "repositories/{0}/issues/{1}/reactions/{2}".FormatUri(repositoryId, number, reaction);
+            return "repositories/{0}/issues/{1}/reactions/{2}".FormatUri(repositoryId, number, reactionId);
         }
 
         /// <summary>
@@ -633,11 +633,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri IssueComment(string owner, string name, int id)
+        public static Uri IssueComment(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/issues/comments/{2}".FormatUri(owner, name, id);
+            return "repos/{0}/{1}/issues/comments/{2}".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
@@ -645,22 +645,22 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri IssueCommentReactions(string owner, string name, int number)
+        public static Uri IssueCommentReactions(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/issues/comments/{2}/reactions".FormatUri(owner, name, number);
+            return "repos/{0}/{1}/issues/comments/{2}/reactions".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reaction of a specified issue comment.
         /// </summary>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri IssueCommentReactions(long repositoryId, int number)
+        public static Uri IssueCommentReactions(long repositoryId, long commentId)
         {
-            return "repositories/{0}/issues/comments/{1}/reactions".FormatUri(repositoryId, number);
+            return "repositories/{0}/issues/comments/{1}/reactions".FormatUri(repositoryId, commentId);
         }
 
         /// <summary>
@@ -668,24 +668,24 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reactionid for the comment</param>
         /// <returns></returns>
-        public static Uri IssueCommentReaction(string owner, string name, int number, int reaction)
+        public static Uri IssueCommentReaction(string owner, string name, long commentId, long reaction)
         {
-            return "repos/{0}/{1}/issues/comments/{2}/reactions/{3}".FormatUri(owner, name, number, reaction);
+            return "repos/{0}/{1}/issues/comments/{2}/reactions/{3}".FormatUri(owner, name, commentId, reaction);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reaction of a specified issue comment.
         /// </summary>
         /// <param name="repositoryId">The owner of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reactionid for the comment</param>
         /// <returns></returns>
-        public static Uri IssueCommentReaction(long repositoryId, int number, int reaction)
+        public static Uri IssueCommentReaction(long repositoryId, long commentId, long reaction)
         {
-            return "repositories/{0}/issues/comments/{1}/reactions/{2}".FormatUri(repositoryId, number, reaction);
+            return "repositories/{0}/issues/comments/{1}/reactions/{2}".FormatUri(repositoryId, commentId, reaction);
         }
 
         /// <summary>
@@ -693,11 +693,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri CommitComment(string owner, string name, int number)
+        public static Uri CommitComment(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/comments/{2}".FormatUri(owner, name, number);
+            return "repos/{0}/{1}/comments/{2}".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
@@ -728,22 +728,22 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri CommitCommentReactions(string owner, string name, int number)
+        public static Uri CommitCommentReactions(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/comments/{2}/reactions".FormatUri(owner, name, number);
+            return "repos/{0}/{1}/comments/{2}/reactions".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reaction of a specified commit comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri CommitCommentReactions(long repositoryId, int number)
+        public static Uri CommitCommentReactions(long repositoryId, long commentId)
         {
-            return "repositories/{0}/comments/{1}/reactions".FormatUri(repositoryId, number);
+            return "repositories/{0}/comments/{1}/reactions".FormatUri(repositoryId, commentId);
         }
 
         /// <summary>
@@ -751,24 +751,24 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction number</param>
         /// <returns></returns>
-        public static Uri CommitCommentReaction(string owner, string name, int number, int reaction)
+        public static Uri CommitCommentReaction(string owner, string name, long commentId, long reaction)
         {
-            return "repos/{0}/{1}/comments/{2}/reactions/{3}".FormatUri(owner, name, number, reaction);
+            return "repos/{0}/{1}/comments/{2}/reactions/{3}".FormatUri(owner, name, commentId, reaction);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reaction of a specified commit comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reaction number</param>
         /// <returns></returns>
-        public static Uri CommitCommentReaction(long repositoryId, int number, int reaction)
+        public static Uri CommitCommentReaction(long repositoryId, long commentId, long reaction)
         {
-            return "repositories/{0}/comments/{1}/reactions/{2}".FormatUri(repositoryId, number, reaction);
+            return "repositories/{0}/comments/{1}/reactions/{2}".FormatUri(repositoryId, commentId, reaction);
         }
 
         /// <summary>
@@ -1029,11 +1029,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="id">The event id</param>
+        /// <param name="eventId">The event id</param>
         /// <returns></returns>
-        public static Uri IssuesEvent(string owner, string name, long id)
+        public static Uri IssuesEvent(string owner, string name, long eventId)
         {
-            return "repos/{0}/{1}/issues/events/{2}".FormatUri(owner, name, id);
+            return "repos/{0}/{1}/issues/events/{2}".FormatUri(owner, name, eventId);
         }
 
         /// <summary>
@@ -1375,19 +1375,19 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> for the specified gist.
         /// </summary>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
-        public static Uri Gist(string id)
+        public static Uri Gist(string gistId)
         {
-            return "gists/{0}".FormatUri(id);
+            return "gists/{0}".FormatUri(gistId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the forks for the specified gist.
         /// </summary>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
-        public static Uri ForkGist(string id)
+        public static Uri ForkGist(string gistId)
         {
-            return "gists/{0}/forks".FormatUri(id);
+            return "gists/{0}/forks".FormatUri(gistId);
         }
 
         /// <summary>
@@ -1418,10 +1418,10 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> to star a given gist.
         /// </summary>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
-        public static Uri StarGist(string id)
+        public static Uri StarGist(string gistId)
         {
-            return "gists/{0}/star".FormatUri(id);
+            return "gists/{0}/star".FormatUri(gistId);
         }
 
         /// <summary>
@@ -1436,10 +1436,10 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> for the commits for the specified gist.
         /// </summary>
-        /// <param name="id">The id of the gist</param>
+        /// <param name="gistId">The id of the gist</param>
-        public static Uri GistCommits(string id)
+        public static Uri GistCommits(string gistId)
         {
-            return "gists/{0}/commits".FormatUri(id);
+            return "gists/{0}/commits".FormatUri(gistId);
         }
 
         /// <summary>
@@ -1506,7 +1506,7 @@ namespace Octokit
         /// </summary>
         /// <param name="gistId">The id of the gist</param>
         /// <param name="commentId">The id of the comment</param>
-        public static Uri GistComment(string gistId, int commentId)
+        public static Uri GistComment(string gistId, long commentId)
         {
             return "gists/{0}/comments/{1}".FormatUri(gistId, commentId);
         }
@@ -1681,11 +1681,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns>The <see cref="Uri"/></returns>
-        public static Uri PullRequestReviewComment(string owner, string name, int number)
+        public static Uri PullRequestReviewComment(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/pulls/comments/{2}".FormatUri(owner, name, number);
+            return "repos/{0}/{1}/pulls/comments/{2}".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
@@ -1793,22 +1793,22 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri PullRequestReviewCommentReactions(string owner, string name, int number)
+        public static Uri PullRequestReviewCommentReactions(string owner, string name, long commentId)
         {
-            return "repos/{0}/{1}/pulls/comments/{2}/reactions".FormatUri(owner, name, number);
+            return "repos/{0}/{1}/pulls/comments/{2}/reactions".FormatUri(owner, name, commentId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reactions of a specified pull request review comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns></returns>
-        public static Uri PullRequestReviewCommentReactions(long repositoryId, int number)
+        public static Uri PullRequestReviewCommentReactions(long repositoryId, long commentId)
         {
-            return "repositories/{0}/pulls/comments/{1}/reactions".FormatUri(repositoryId, number);
+            return "repositories/{0}/pulls/comments/{1}/reactions".FormatUri(repositoryId, commentId);
         }
 
 
@@ -1817,24 +1817,24 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of the repository</param>
         /// <param name="name">The name of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reactionid for the comment</param>
         /// <returns></returns>
-        public static Uri PullRequestReviewCommentReaction(string owner, string name, int number, int reaction)
+        public static Uri PullRequestReviewCommentReaction(string owner, string name, long commentId, long reaction)
         {
-            return "repos/{0}/{1}/pulls/comments/{2}/reactions/{3}".FormatUri(owner, name, number, reaction);
+            return "repos/{0}/{1}/pulls/comments/{2}/reactions/{3}".FormatUri(owner, name, commentId, reaction);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for the reaction of a specified pull request review comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <param name="reaction">The reactionid for the comment</param>
         /// <returns></returns>
-        public static Uri PullRequestReviewCommentReaction(long repositoryId, int number, int reaction)
+        public static Uri PullRequestReviewCommentReaction(long repositoryId, long commentId, long reaction)
         {
-            return "repositories/{0}/pulls/comments/{1}/reactions/{2}".FormatUri(repositoryId, number, reaction);
+            return "repositories/{0}/pulls/comments/{1}/reactions/{2}".FormatUri(repositoryId, commentId, reaction);
         }
 
         /// <summary>
@@ -1935,22 +1935,22 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> for child teams
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="parentTeamId">The id of the parent team</param>
         /// <returns></returns>
-        public static Uri TeamChildTeams(int id)
+        public static Uri TeamChildTeams(int parentTeamId)
         {
-            return "teams/{0}/teams".FormatUri(id);
+            return "teams/{0}/teams".FormatUri(parentTeamId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for teams
         /// use for getting, updating, or deleting a <see cref="Team"/>.
         /// </summary>
-        /// <param name="id">The id of the <see cref="Team"/>.</param>
+        /// <param name="teamId">The id of the <see cref="Team"/>.</param>
         /// <returns></returns>
-        public static Uri Teams(int id)
+        public static Uri Teams(int teamId)
         {
-            return "teams/{0}".FormatUri(id);
+            return "teams/{0}".FormatUri(teamId);
         }
 
         /// <summary>
@@ -1968,40 +1968,40 @@ namespace Octokit
         /// <summary>
         /// returns the <see cref="Uri"/> for team member
         /// </summary>
-        /// <param name="id">The team id</param>
+        /// <param name="teamId">The team id</param>
         /// <param name="login">The user login.</param>
-        public static Uri TeamMember(int id, string login)
+        public static Uri TeamMember(int teamId, string login)
         {
-            return "teams/{0}/memberships/{1}".FormatUri(id, login);
+            return "teams/{0}/memberships/{1}".FormatUri(teamId, login);
         }
 
         /// <summary>
         /// returns the <see cref="Uri"/> for team members list
         /// </summary>
-        /// <param name="id">The team id</param>
+        /// <param name="teamId">The team id</param>
-        public static Uri TeamMembers(int id)
+        public static Uri TeamMembers(int teamId)
         {
-            return "teams/{0}/members".FormatUri(id);
+            return "teams/{0}/members".FormatUri(teamId);
         }
 
         /// <summary>
         /// returns the <see cref="Uri"/> for the repositories
         /// </summary>
-        /// <param name="id">The team id</param>
+        /// <param name="teamId">The team id</param>
-        public static Uri TeamRepositories(int id)
+        public static Uri TeamRepositories(int teamId)
         {
-            return "teams/{0}/repos".FormatUri(id);
+            return "teams/{0}/repos".FormatUri(teamId);
         }
 
         /// <summary>
         /// returns the <see cref="Uri"/> for a team repository
         /// </summary>
-        /// <param name="id">The team id</param>
+        /// <param name="teamId">The team id</param>
         /// <param name="organization">The organization id</param>
         /// <param name="repoName">The repository name</param>
-        public static Uri TeamRepository(int id, string organization, string repoName)
+        public static Uri TeamRepository(int teamId, string organization, string repoName)
         {
-            return "teams/{0}/repos/{1}/{2}".FormatUri(id, organization, repoName);
+            return "teams/{0}/repos/{1}/{2}".FormatUri(teamId, organization, repoName);
         }
 
         /// <summary>
@@ -2019,11 +2019,11 @@ namespace Octokit
         /// <summary>
         /// returns the <see cref="Uri"/> for the teams pending invitations
         /// </summary>
-        /// <param name="id">The team id</param>
+        /// <param name="teamId">The team id</param>
         /// <returns></returns>
-        public static Uri TeamPendingInvitations(int id)
+        public static Uri TeamPendingInvitations(int teamId)
         {
-            return "teams/{0}/invitations".FormatUri(id);
+            return "teams/{0}/invitations".FormatUri(teamId);
         }
 
         /// <summary>
@@ -2939,9 +2939,9 @@ namespace Octokit
             return "enterprise/settings/license".FormatUri();
         }
 
-        public static Uri EnterpriseMigrationById(string org, int id)
+        public static Uri EnterpriseMigrationById(string org, int migrationId)
         {
-            return "orgs/{0}/migrations/{1}".FormatUri(org, id);
+            return "orgs/{0}/migrations/{1}".FormatUri(org, migrationId);
         }
 
         public static Uri EnterpriseMigrations(string org)
@@ -2949,14 +2949,14 @@ namespace Octokit
             return "orgs/{0}/migrations".FormatUri(org);
         }
 
-        public static Uri EnterpriseMigrationArchive(string org, int id)
+        public static Uri EnterpriseMigrationArchive(string org, int migrationId)
         {
-            return "orgs/{0}/migrations/{1}/archive".FormatUri(org, id);
+            return "orgs/{0}/migrations/{1}/archive".FormatUri(org, migrationId);
         }
 
-        public static Uri EnterpriseMigrationUnlockRepository(string org, int id, string repo)
+        public static Uri EnterpriseMigrationUnlockRepository(string org, int migrationId, string repo)
         {
-            return "orgs/{0}/migrations/{1}/repos/{2}/lock".FormatUri(org, id, repo);
+            return "orgs/{0}/migrations/{1}/repos/{2}/lock".FormatUri(org, migrationId, repo);
         }
 
         public static Uri EnterpriseManagementConsoleMaintenance(string managementConsolePassword, Uri baseAddress)
@@ -3084,11 +3084,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns the assets specified by the asset id.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release asset</param>
+        /// <param name="releaseAssetId">The id of the release asset</param>
         /// <returns>The <see cref="Uri"/> that returns the assets specified by the asset id.</returns>
-        public static Uri Asset(long repositoryId, int id)
+        public static Uri Asset(long repositoryId, int releaseAssetId)
         {
-            return "repositories/{0}/releases/assets/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/releases/assets/{1}".FormatUri(repositoryId, releaseAssetId);
         }
 
         /// <summary>
@@ -3164,11 +3164,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> for the specified comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns>The <see cref="Uri"/> for the specified comment.</returns>
-        public static Uri CommitComment(long repositoryId, int number)
+        public static Uri CommitComment(long repositoryId, long commentId)
         {
-            return "repositories/{0}/comments/{1}".FormatUri(repositoryId, number);
+            return "repositories/{0}/comments/{1}".FormatUri(repositoryId, commentId);
         }
 
         /// <summary>
@@ -3298,12 +3298,12 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> that returns the GPG Key for the authenticated user for the specified Id.
         /// </summary>
-        /// <param name="id">The <see cref="Uri"/> that returns the GPG Key for the authenticated user for the specified Id.</param>
+        /// <param name="gpgKeyId">The GPG Key Id.</param>
         /// <returns></returns>
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Gpg")]
-        public static Uri GpgKeys(int id)
+        public static Uri GpgKeys(int gpgKeyId)
         {
-            return "user/gpg_keys/{0}".FormatUri(id);
+            return "user/gpg_keys/{0}".FormatUri(gpgKeyId);
         }
 
         /// <summary>
@@ -3321,11 +3321,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> for the specified comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The comment id</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns>The <see cref="Uri"/> for the specified comment.</returns>
-        public static Uri IssueComment(long repositoryId, int id)
+        public static Uri IssueComment(long repositoryId, long commentId)
         {
-            return "repositories/{0}/issues/comments/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/issues/comments/{1}".FormatUri(repositoryId, commentId);
         }
 
         /// <summary>
@@ -3397,11 +3397,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns the issue/pull request event and issue info for the specified event.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The event id</param>
+        /// <param name="eventId">The event id</param>
         /// <returns>The <see cref="Uri"/> that returns the issue/pull request event and issue info for the specified event.</returns>
-        public static Uri IssuesEvent(long repositoryId, long id)
+        public static Uri IssuesEvent(long repositoryId, long eventId)
         {
-            return "repositories/{0}/issues/events/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/issues/events/{1}".FormatUri(repositoryId, eventId);
         }
 
         /// <summary>
@@ -3546,11 +3546,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> for the specified pull request review comment.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="number">The comment number</param>
+        /// <param name="commentId">The comment id</param>
         /// <returns>The <see cref="Uri"/> that </returns>
-        public static Uri PullRequestReviewComment(long repositoryId, int number)
+        public static Uri PullRequestReviewComment(long repositoryId, long commentId)
         {
-            return "repositories/{0}/pulls/comments/{1}".FormatUri(repositoryId, number);
+            return "repositories/{0}/pulls/comments/{1}".FormatUri(repositoryId, commentId);
         }
 
         /// <summary>
@@ -3620,11 +3620,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns all the assets for the specified release for the specified repository.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <returns>The <see cref="Uri"/> that returns all the assets for the specified release for the specified repository.</returns>
-        public static Uri ReleaseAssets(long repositoryId, int id)
+        public static Uri ReleaseAssets(long repositoryId, int releaseId)
         {
-            return "repositories/{0}/releases/{1}/assets".FormatUri(repositoryId, id);
+            return "repositories/{0}/releases/{1}/assets".FormatUri(repositoryId, releaseId);
         }
 
         /// <summary>
@@ -3651,11 +3651,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns a single release for the specified repository
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The id of the release</param>
+        /// <param name="releaseId">The id of the release</param>
         /// <returns>The <see cref="Uri"/> that returns a single release for the specified repository</returns>
-        public static Uri Releases(long repositoryId, int id)
+        public static Uri Releases(long repositoryId, int releaseId)
         {
-            return "repositories/{0}/releases/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/releases/{1}".FormatUri(repositoryId, releaseId);
         }
 
         /// <summary>
@@ -4260,21 +4260,21 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> for a project.
         /// </summary>
-        /// <param name="id">The id of the project</param>
+        /// <param name="projectId">The id of the project</param>
         /// <returns>The <see cref="Uri"/> for repository projects.</returns>
-        public static Uri Project(int id)
+        public static Uri Project(int projectId)
         {
-            return "projects/{0}".FormatUri(id);
+            return "projects/{0}".FormatUri(projectId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for project columns.
         /// </summary>
-        /// <param name="id">The id of the columns</param>
+        /// <param name="columnId">The id of the columns</param>
         /// <returns>The <see cref="Uri"/> for project columns.</returns>
-        public static Uri ProjectColumn(int id)
+        public static Uri ProjectColumn(int columnId)
         {
-            return "projects/columns/{0}".FormatUri(id);
+            return "projects/columns/{0}".FormatUri(columnId);
         }
 
         /// <summary>
@@ -4290,21 +4290,21 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> to move a project column.
         /// </summary>
-        /// <param name="id">The id of the column to move</param>
+        /// <param name="columnId">The id of the column to move</param>
         /// <returns>The <see cref="Uri"/> to move a project column.</returns>
-        public static Uri ProjectColumnMove(int id)
+        public static Uri ProjectColumnMove(int columnId)
         {
-            return "projects/columns/{0}/moves".FormatUri(id);
+            return "projects/columns/{0}/moves".FormatUri(columnId);
         }
 
         /// <summary>
         /// Returns the <see cref="Uri"/> for project cards.
         /// </summary>
-        /// <param name="id">The id of the card</param>
+        /// <param name="cardId">The id of the card</param>
         /// <returns>The <see cref="Uri"/> for project cards.</returns>
-        public static Uri ProjectCard(int id)
+        public static Uri ProjectCard(int cardId)
         {
-            return "projects/columns/cards/{0}".FormatUri(id);
+            return "projects/columns/cards/{0}".FormatUri(cardId);
         }
 
         /// <summary>
@@ -4320,11 +4320,11 @@ namespace Octokit
         /// <summary>
         /// Returns the <see cref="Uri"/> to move a project card.
         /// </summary>
-        /// <param name="id">The id of the card to move</param>
+        /// <param name="cardId">The id of the card to move</param>
         /// <returns>The <see cref="Uri"/> to move a project card.</returns>
-        public static Uri ProjectCardMove(int id)
+        public static Uri ProjectCardMove(int cardId)
         {
-            return "projects/columns/cards/{0}/moves".FormatUri(id);
+            return "projects/columns/cards/{0}/moves".FormatUri(cardId);
         }
 
         /// <summary>
@@ -4352,11 +4352,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns the specified check run.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The check run Id</param>
+        /// <param name="checkRunId">The check run Id</param>
         /// <returns>The <see cref="Uri"/> that returns the specified check run.</returns>
-        public static Uri CheckRun(long repositoryId, long id)
+        public static Uri CheckRun(long repositoryId, long checkRunId)
         {
-            return "repositories/{0}/check-runs/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/check-runs/{1}".FormatUri(repositoryId, checkRunId);
         }
 
         /// <summary>
@@ -4364,11 +4364,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of repo</param>
         /// <param name="repo">The name of repo</param>
-        /// <param name="id">The check run Id</param>
+        /// <param name="checkRunId">The check run Id</param>
         /// <returns>The <see cref="Uri"/> that returns the specified check run.</returns>
-        public static Uri CheckRun(string owner, string repo, long id)
+        public static Uri CheckRun(string owner, string repo, long checkRunId)
         {
-            return "repos/{0}/{1}/check-runs/{2}".FormatUri(owner, repo, id);
+            return "repos/{0}/{1}/check-runs/{2}".FormatUri(owner, repo, checkRunId);
         }
 
         /// <summary>
@@ -4465,11 +4465,11 @@ namespace Octokit
         /// Returns the <see cref="Uri"/> that returns the specified check suite.
         /// </summary>
         /// <param name="repositoryId">The Id of the repository</param>
-        /// <param name="id">The check run Id</param>
+        /// <param name="checkRunId">The check run Id</param>
         /// <returns>The <see cref="Uri"/> that returns the specified check suite.</returns>
-        public static Uri CheckSuite(long repositoryId, long id)
+        public static Uri CheckSuite(long repositoryId, long checkRunId)
         {
-            return "repositories/{0}/check-suites/{1}".FormatUri(repositoryId, id);
+            return "repositories/{0}/check-suites/{1}".FormatUri(repositoryId, checkRunId);
         }
 
         /// <summary>
@@ -4477,11 +4477,11 @@ namespace Octokit
         /// </summary>
         /// <param name="owner">The owner of repo</param>
         /// <param name="repo">The name of repo</param>
-        /// <param name="id">The check run Id</param>
+        /// <param name="checkRunId">The check run Id</param>
         /// <returns>The <see cref="Uri"/> that returns the specified check suite.</returns>
-        public static Uri CheckSuite(string owner, string repo, long id)
+        public static Uri CheckSuite(string owner, string repo, long checkRunId)
         {
-            return "repos/{0}/{1}/check-suites/{2}".FormatUri(owner, repo, id);
+            return "repos/{0}/{1}/check-suites/{2}".FormatUri(owner, repo, checkRunId);
         }
 
         /// <summary>

Octokit/Models/Request/PullRequestReviewCommentReplyCreate.cs

@@ -14,7 +14,7 @@ namespace Octokit
         /// </summary>
         /// <param name="body">The text of the comment</param>
         /// <param name="inReplyTo">The comment Id to reply to</param>
-        public PullRequestReviewCommentReplyCreate(string body, int inReplyTo)
+        public PullRequestReviewCommentReplyCreate(string body, long inReplyTo)
         {
             Ensure.ArgumentNotNullOrEmptyString(body, nameof(body));
 
@@ -30,7 +30,7 @@ namespace Octokit
         /// <summary>
         /// The comment Id to reply to.
         /// </summary>
-        public int InReplyTo { get; private set; }
+        public long InReplyTo { get; private set; }
 
         internal string DebuggerDisplay
         {

Octokit/Models/Response/CommitComment.cs

@@ -9,7 +9,7 @@ namespace Octokit
     {
         public CommitComment() { }
 
-        public CommitComment(int id, string nodeId, string url, string htmlUrl, string body, string path, int position, int? line, string commitId, User user, DateTimeOffset createdAt, DateTimeOffset? updatedAt, ReactionSummary reactions)
+        public CommitComment(long id, string nodeId, string url, string htmlUrl, string body, string path, int position, int? line, string commitId, User user, DateTimeOffset createdAt, DateTimeOffset? updatedAt, ReactionSummary reactions)
         {
             Id = id;
             NodeId = nodeId;
@@ -29,7 +29,7 @@ namespace Octokit
         /// <summary>
         /// The issue comment Id.
         /// </summary>
-        public int Id { get; private set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// GraphQL Node Id

Octokit/Models/Response/GistComment.cs

@@ -9,7 +9,7 @@ namespace Octokit
     {
         public GistComment() { }
 
-        public GistComment(int id, string nodeId, string url, string body, User user, DateTimeOffset createdAt, DateTimeOffset? updatedAt)
+        public GistComment(long id, string nodeId, string url, string body, User user, DateTimeOffset createdAt, DateTimeOffset? updatedAt)
         {
             Id = id;
             NodeId = nodeId;
@@ -23,7 +23,7 @@ namespace Octokit
         /// <summary>
         /// The gist comment id.
         /// </summary>
-        public int Id { get; private set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// GraphQL Node Id

Octokit/Models/Response/IssueComment.cs

@@ -10,7 +10,7 @@ namespace Octokit
     {
         public IssueComment() { }
 
-        public IssueComment(int id, string nodeId, string url, string htmlUrl, string body, DateTimeOffset createdAt, DateTimeOffset? updatedAt, User user, ReactionSummary reactions, AuthorAssociation authorAssociation)
+        public IssueComment(long id, string nodeId, string url, string htmlUrl, string body, DateTimeOffset createdAt, DateTimeOffset? updatedAt, User user, ReactionSummary reactions, AuthorAssociation authorAssociation)
         {
             Id = id;
             NodeId = nodeId;
@@ -27,7 +27,7 @@ namespace Octokit
         /// <summary>
         /// The issue comment Id.
         /// </summary>
-        public int Id { get; private set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// GraphQL Node Id

Octokit/Models/Response/PullRequestReviewComment.cs

@@ -10,12 +10,12 @@ namespace Octokit
     {
         public PullRequestReviewComment() { }
 
-        public PullRequestReviewComment(int id)
+        public PullRequestReviewComment(long id)
         {
             Id = id;
         }
 
-        public PullRequestReviewComment(string url, int id, string nodeId, string diffHunk, string path, int? position, int? originalPosition, string commitId, string originalCommitId, User user, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, string htmlUrl, string pullRequestUrl, ReactionSummary reactions, int? inReplyToId, int? pullRequestReviewId, AuthorAssociation authorAssociation)
+        public PullRequestReviewComment(string url, long id, string nodeId, string diffHunk, string path, int? position, int? originalPosition, string commitId, string originalCommitId, User user, string body, DateTimeOffset createdAt, DateTimeOffset updatedAt, string htmlUrl, string pullRequestUrl, ReactionSummary reactions, int? inReplyToId, int? pullRequestReviewId, AuthorAssociation authorAssociation)
         {
             PullRequestReviewId = pullRequestReviewId;
             Url = url;
@@ -46,7 +46,7 @@ namespace Octokit
         /// <summary>
         /// The comment Id.
         /// </summary>
-        public int Id { get; private set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// GraphQL Node Id

Octokit/Models/Response/Reaction.cs

@@ -36,7 +36,7 @@ namespace Octokit
     {
         public Reaction() { }
 
-        public Reaction(int id, string nodeId, User user, ReactionType content)
+        public Reaction(long id, string nodeId, User user, ReactionType content)
         {
             Id = id;
             NodeId = nodeId;
@@ -47,7 +47,7 @@ namespace Octokit
         /// <summary>
         /// The Id for this reaction.
         /// </summary>
-        public int Id { get; private set; }
+        public long Id { get; private set; }
 
         /// <summary>
         /// GraphQL Node Id

Octokit/Models/Response/TeamRepository.cs

@@ -357,7 +357,7 @@ namespace Octokit
         public string IssuesUrl { get; private set; }
 
         /// <summary>
-        /// example: http://api.github.com/repos/octocat/Hello-World/keys{/key_id}
+        /// example: http://api.github.com/repos/octocat/Hello-World/keys{/keyId}
         /// </summary>
         public string KeysUrl { get; private set; }