diff --git a/src/api/current.rs b/src/api/current.rs
index 877d4765..0c3b634e 100644
--- a/src/api/current.rs
+++ b/src/api/current.rs
@@ -21,7 +21,7 @@ impl<'octo> CurrentAuthHandler<'octo> {
     }
 
     /// Fetches information about the current user.
-    pub async fn user(&self) -> Result<models::User> {
+    pub async fn user(&self) -> Result<models::Author> {
         self.crab.get("user", None::<&()>).await
     }
 
diff --git a/src/api/issues.rs b/src/api/issues.rs
index 172c7ed2..c0a757e0 100644
--- a/src/api/issues.rs
+++ b/src/api/issues.rs
@@ -304,7 +304,7 @@ impl<'octo, 'r> ListAssigneesBuilder<'octo, 'r> {
     }
 
     /// Send the actual request.
-    pub async fn send(self) -> Result<crate::Page<models::User>> {
+    pub async fn send(self) -> Result<crate::Page<models::Author>> {
         let route = format!(
             "repos/{owner}/{repo}/assignees",
             owner = self.handler.owner,
diff --git a/src/api/orgs/list_members.rs b/src/api/orgs/list_members.rs
index 20f149d2..993ea367 100644
--- a/src/api/orgs/list_members.rs
+++ b/src/api/orgs/list_members.rs
@@ -31,7 +31,7 @@ impl<'octo, 'r> ListOrgMembersBuilder<'octo, 'r> {
         self
     }
 
-    pub async fn send(self) -> crate::Result<crate::Page<crate::models::User>> {
+    pub async fn send(self) -> crate::Result<crate::Page<crate::models::Author>> {
         let url = format!("orgs/{org}/members", org = self.handler.owner);
         self.handler.crab.get(url, Some(&self)).await
     }
diff --git a/src/api/repos.rs b/src/api/repos.rs
index 74b44437..2cb3f7b5 100644
--- a/src/api/repos.rs
+++ b/src/api/repos.rs
@@ -210,7 +210,7 @@ impl<'octo> RepoHandler<'octo> {
     /// Creates a new file in the repository.
     /// ```no_run
     /// # async fn run() -> octocrab::Result<()> {
-    /// use octocrab::models::repos::GitUser;
+    /// use octocrab::models::repos::CommitAuthor;
     ///
     /// // Commit to add "crabs/ferris.txt"
     /// octocrab::instance()
@@ -221,11 +221,11 @@ impl<'octo> RepoHandler<'octo> {
     ///         "Thought there’d never be a Rust Rap?\n"
     ///     )
     ///     .branch("master")
-    ///     .commiter(GitUser {
+    ///     .commiter(CommitAuthor {
     ///         name: "Octocat".to_string(),
     ///         email: "octocat@github.com".to_string(),
     ///     })
-    ///     .author(GitUser {
+    ///     .author(CommitAuthor {
     ///         name: "Ferris".to_string(),
     ///         email: "ferris@rust-lang.org".to_string(),
     ///     })
@@ -253,7 +253,7 @@ impl<'octo> RepoHandler<'octo> {
     /// ```no_run
     /// # async fn run() -> octocrab::Result<()> {
     /// # let blob_sha = "";
-    /// use octocrab::models::repos::GitUser;
+    /// use octocrab::models::repos::CommitAuthor;
     ///
     /// // Given the file blob for "crabs/ferris.txt", commit to update the file.
     /// octocrab::instance()
@@ -265,11 +265,11 @@ impl<'octo> RepoHandler<'octo> {
     ///         blob_sha
     ///     )
     ///     .branch("master")
-    ///     .commiter(GitUser {
+    ///     .commiter(CommitAuthor {
     ///         name: "Octocat".to_string(),
     ///         email: "octocat@github.com".to_string(),
     ///     })
-    ///     .author(GitUser {
+    ///     .author(CommitAuthor {
     ///         name: "Ferris".to_string(),
     ///         email: "ferris@rust-lang.org".to_string(),
     ///     })
@@ -299,7 +299,7 @@ impl<'octo> RepoHandler<'octo> {
     /// ```no_run
     /// # async fn run() -> octocrab::Result<()> {
     /// # let blob_sha = "";
-    /// use octocrab::models::repos::GitUser;
+    /// use octocrab::models::repos::CommitAuthor;
     ///
     /// // Commit to delete "crabs/ferris.txt"
     /// octocrab::instance()
@@ -310,11 +310,11 @@ impl<'octo> RepoHandler<'octo> {
     ///         blob_sha
     ///     )
     ///     .branch("master")
-    ///     .commiter(GitUser {
+    ///     .commiter(CommitAuthor {
     ///         name: "Octocat".to_string(),
     ///         email: "octocat@github.com".to_string(),
     ///     })
-    ///     .author(GitUser {
+    ///     .author(CommitAuthor {
     ///         name: "Ferris".to_string(),
     ///         email: "ferris@rust-lang.org".to_string(),
     ///     })
diff --git a/src/api/repos/file.rs b/src/api/repos/file.rs
index 4ad8eed4..eeda0e7c 100644
--- a/src/api/repos/file.rs
+++ b/src/api/repos/file.rs
@@ -58,9 +58,9 @@ pub struct UpdateFileBuilder<'octo, 'r> {
     #[serde(skip_serializing_if = "Option::is_none")]
     branch: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    commiter: Option<models::repos::GitUser>,
+    commiter: Option<models::repos::CommitAuthor>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    author: Option<models::repos::GitUser>,
+    author: Option<models::repos::CommitAuthor>,
 }
 
 impl<'octo, 'r> UpdateFileBuilder<'octo, 'r> {
@@ -90,13 +90,13 @@ impl<'octo, 'r> UpdateFileBuilder<'octo, 'r> {
     }
 
     /// The person that commited the file.
-    pub fn commiter(mut self, commiter: impl Into<models::repos::GitUser>) -> Self {
+    pub fn commiter(mut self, commiter: impl Into<models::repos::CommitAuthor>) -> Self {
         self.commiter = Some(commiter.into());
         self
     }
 
     /// The author of the file.
-    pub fn author(mut self, author: impl Into<models::repos::GitUser>) -> Self {
+    pub fn author(mut self, author: impl Into<models::repos::CommitAuthor>) -> Self {
         self.author = Some(author.into());
         self
     }
@@ -124,9 +124,9 @@ pub struct DeleteFileBuilder<'octo, 'r> {
     #[serde(skip_serializing_if = "Option::is_none")]
     branch: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    commiter: Option<models::repos::GitUser>,
+    commiter: Option<models::repos::CommitAuthor>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    author: Option<models::repos::GitUser>,
+    author: Option<models::repos::CommitAuthor>,
 }
 
 impl<'octo, 'r> DeleteFileBuilder<'octo, 'r> {
@@ -154,13 +154,13 @@ impl<'octo, 'r> DeleteFileBuilder<'octo, 'r> {
     }
 
     /// The person that commited the file.
-    pub fn commiter(mut self, commiter: impl Into<models::repos::GitUser>) -> Self {
+    pub fn commiter(mut self, commiter: impl Into<models::repos::CommitAuthor>) -> Self {
         self.commiter = Some(commiter.into());
         self
     }
 
     /// The author of the file.
-    pub fn author(mut self, author: impl Into<models::repos::GitUser>) -> Self {
+    pub fn author(mut self, author: impl Into<models::repos::CommitAuthor>) -> Self {
         self.author = Some(author.into());
         self
     }
@@ -179,7 +179,7 @@ impl<'octo, 'r> DeleteFileBuilder<'octo, 'r> {
 
 #[cfg(test)]
 mod tests {
-    use crate::models::repos::GitUser;
+    use crate::models::repos::CommitAuthor;
 
     #[test]
     fn serialize() {
@@ -193,11 +193,11 @@ mod tests {
                 "testsha",
             )
             .branch("not-master")
-            .commiter(GitUser {
+            .commiter(CommitAuthor {
                 name: "Octocat".to_string(),
                 email: "octocat@github.com".to_string(),
             })
-            .author(GitUser {
+            .author(CommitAuthor {
                 name: "Ferris".to_string(),
                 email: "ferris@rust-lang.org".to_string(),
             });
@@ -228,11 +228,11 @@ mod tests {
         let builder = repo
             .delete_file("tests/test.txt", "Update test.txt", "testsha")
             .branch("not-master")
-            .commiter(GitUser {
+            .commiter(CommitAuthor {
                 name: "Octocat".to_string(),
                 email: "octocat@github.com".to_string(),
             })
-            .author(GitUser {
+            .author(CommitAuthor {
                 name: "Ferris".to_string(),
                 email: "ferris@rust-lang.org".to_string(),
             });
diff --git a/src/api/search.rs b/src/api/search.rs
index cfb4de36..4f5625fb 100644
--- a/src/api/search.rs
+++ b/src/api/search.rs
@@ -70,7 +70,7 @@ impl<'octo> SearchHandler<'octo> {
     pub fn users<'query>(
         self,
         query: &'query (impl AsRef<str> + ?Sized),
-    ) -> QueryHandler<'octo, 'query, models::User> {
+    ) -> QueryHandler<'octo, 'query, models::Author> {
         QueryHandler::new(self.crab, "users", query.as_ref())
     }
 
diff --git a/src/api/teams/members.rs b/src/api/teams/members.rs
index 3d94a7fc..ce61b60e 100644
--- a/src/api/teams/members.rs
+++ b/src/api/teams/members.rs
@@ -36,7 +36,7 @@ impl<'octo, 'r> ListTeamMembersBuilder<'octo, 'r> {
     }
 
     /// Sends the actual request.
-    pub async fn send(self) -> Result<Page<models::User>> {
+    pub async fn send(self) -> Result<Page<models::Author>> {
         let url = format!(
             "orgs/{org}/teams/{team}/members",
             org = self.handler.owner,
diff --git a/src/lib.rs b/src/lib.rs
index d01e38ac..fc698700 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -78,7 +78,7 @@
 //!
 //! ```no_run
 //! # async fn run() -> octocrab::Result<()> {
-//! let user: octocrab::models::User = octocrab::instance()
+//! let user: octocrab::models::Author = octocrab::instance()
 //!     .get("user", None::<&()>)
 //!     .await?;
 //! # Ok(())
diff --git a/src/models.rs b/src/models.rs
index 54d86d10..63237612 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -209,13 +209,13 @@ pub struct IssueEvent {
     pub node_id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub url: Option<String>,
-    pub actor: User,
+    pub actor: Author,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assignee: Option<User>,
+    pub assignee: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assignees: Option<Vec<User>>,
+    pub assignees: Option<Vec<Author>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assigner: Option<User>,
+    pub assigner: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub labels: Option<Vec<Label>>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -260,7 +260,7 @@ pub struct Project {
     pub number: u32,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub state: Option<String>,
-    pub creator: User,
+    pub creator: Author,
     pub created_at: DateTime<Utc>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub updated_at: Option<DateTime<Utc>>,
@@ -302,7 +302,7 @@ pub struct IssuePullRequest {
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
 #[non_exhaustive]
-pub struct User {
+pub struct Author {
     pub login: String,
     pub id: UserId,
     pub node_id: String,
@@ -327,7 +327,7 @@ pub struct User {
 #[non_exhaustive]
 pub struct StarGazer {
     pub starred_at: Option<DateTime<Utc>>,
-    pub user: Option<User>,
+    pub user: Option<Author>,
 }
 
 #[derive(Debug, Clone, Hash, Eq, PartialEq, Serialize, Deserialize)]
@@ -359,7 +359,7 @@ pub struct Milestone {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub creator: Option<User>,
+    pub creator: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub open_issues: Option<i64>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -383,7 +383,7 @@ pub struct Repository {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub full_name: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub owner: Option<User>,
+    pub owner: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub private: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -682,7 +682,7 @@ pub struct Status {
     pub updated_at: Option<DateTime<Utc>>,
     pub state: StatusState,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub creator: Option<User>,
+    pub creator: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub context: Option<String>,
 }
@@ -709,7 +709,7 @@ pub struct InstallationRepositories {
 #[non_exhaustive]
 pub struct Installation {
     pub id: InstallationId,
-    pub account: User,
+    pub account: Author,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub access_tokens_url: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
diff --git a/src/models/apps.rs b/src/models/apps.rs
index 21b109d0..ea07c557 100644
--- a/src/models/apps.rs
+++ b/src/models/apps.rs
@@ -8,7 +8,7 @@ pub struct App {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub slug: Option<String>,
     pub node_id: String,
-    pub owner: User,
+    pub owner: Author,
     pub name: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
diff --git a/src/models/commits.rs b/src/models/commits.rs
index 2c3b72ca..32202215 100644
--- a/src/models/commits.rs
+++ b/src/models/commits.rs
@@ -16,7 +16,7 @@ pub struct Comment {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub line: Option<u64>,
     pub commit_id: String,
-    pub user: User,
+    pub user: Author,
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub updated_at: Option<chrono::DateTime<chrono::Utc>>,
diff --git a/src/models/events/payload.rs b/src/models/events/payload.rs
index be322b4a..461366f9 100644
--- a/src/models/events/payload.rs
+++ b/src/models/events/payload.rs
@@ -12,7 +12,7 @@ mod pull_request_review_comment;
 mod push;
 mod workflow_run;
 
-use crate::models::repos::GitUser;
+use crate::models::repos::CommitAuthor;
 pub use commit_comment::*;
 pub use create::*;
 pub use delete::*;
@@ -60,7 +60,7 @@ pub enum EventPayload {
 #[non_exhaustive]
 pub struct Commit {
     pub sha: String,
-    pub author: GitUser,
+    pub author: CommitAuthor,
     pub message: String,
     pub distinct: bool,
     pub url: Url,
diff --git a/src/models/events/payload/issues.rs b/src/models/events/payload/issues.rs
index 86fd07aa..6ce08929 100644
--- a/src/models/events/payload/issues.rs
+++ b/src/models/events/payload/issues.rs
@@ -1,4 +1,4 @@
-use crate::models::{issues::Issue, Label, User};
+use crate::models::{issues::Issue, Label, Author};
 use serde::{Deserialize, Serialize};
 
 /// The payload in a [`super::EventPayload::IssuesEvent`] type.
@@ -15,7 +15,7 @@ pub struct IssuesEventPayload {
     ///
     /// Set when they type is [`IssuesEventAction::Assigned`] or
     /// [`IssuesEventAction::Unassigned`].
-    pub assignee: Option<User>,
+    pub assignee: Option<Author>,
     /// The optional label added or removed from the issue.
     ///
     /// Set when the type is [`IssuesEventAction::Labeled`] or
diff --git a/src/models/events/payload/member.rs b/src/models/events/payload/member.rs
index cc5a2c85..eec764bf 100644
--- a/src/models/events/payload/member.rs
+++ b/src/models/events/payload/member.rs
@@ -1,4 +1,4 @@
-use crate::models::User;
+use crate::models::Author;
 use serde::{Deserialize, Serialize};
 
 /// The payload in a [`super::EventPayload::MemberEvent`] type.
@@ -8,7 +8,7 @@ pub struct MemberEventPayload {
     /// The action this event represents.
     pub action: MemberEventAction,
     /// The user this event corresponds to.
-    pub member: User,
+    pub member: Author,
     /// Only available on webhooks.
     ///
     /// Changes to the collaborator permissions.
diff --git a/src/models/events/payload/push.rs b/src/models/events/payload/push.rs
index 1179547f..3812b346 100644
--- a/src/models/events/payload/push.rs
+++ b/src/models/events/payload/push.rs
@@ -20,7 +20,7 @@ pub struct PushEventPayload {
 mod test {
     use crate::models::{
         events::{payload::EventPayload, Event},
-        repos::GitUser,
+        repos::CommitAuthor,
     };
     use reqwest::Url;
 
@@ -43,7 +43,7 @@ mod test {
                 assert_eq!(commit.sha, "eb1a60c03544dcea290f2d57bb66ae188ce25778");
                 assert_eq!(
                     commit.author,
-                    GitUser {
+                    CommitAuthor {
                         name: "readme-bot".to_string(),
                         email: "readme-bot@example.com".to_string()
                     }
diff --git a/src/models/events/payload/workflow_run.rs b/src/models/events/payload/workflow_run.rs
index 970b42d3..34fc570a 100644
--- a/src/models/events/payload/workflow_run.rs
+++ b/src/models/events/payload/workflow_run.rs
@@ -1,7 +1,7 @@
 use crate::models::{
     orgs::Organization,
     workflows::{Run, WorkFlow},
-    Repository, User,
+    Repository, Author,
 };
 use serde::{Deserialize, Serialize};
 
@@ -14,7 +14,7 @@ pub struct WorkflowRunEventPayload {
     pub workflow: WorkFlow,
     pub organization: Option<Organization>,
     pub repository: Repository,
-    pub sender: User,
+    pub sender: Author,
 }
 
 /// The action on a pull request this event corresponds to.
diff --git a/src/models/gists.rs b/src/models/gists.rs
index 3c5073f1..76262171 100644
--- a/src/models/gists.rs
+++ b/src/models/gists.rs
@@ -35,7 +35,7 @@ pub struct GistFile {
 #[non_exhaustive]
 #[derive(Debug, Deserialize)]
 pub struct GistCommit {
-    pub user: Option<User>,
+    pub user: Option<Author>,
     pub version: String,
     pub committed_at: DateTime<Utc>,
     pub change_status: GistChangeStatus,
diff --git a/src/models/issues.rs b/src/models/issues.rs
index d4371bbd..3197030d 100644
--- a/src/models/issues.rs
+++ b/src/models/issues.rs
@@ -20,11 +20,11 @@ pub struct Issue {
     pub body_text: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub body_html: Option<String>,
-    pub user: User,
+    pub user: Author,
     pub labels: Vec<Label>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assignee: Option<User>,
-    pub assignees: Vec<User>,
+    pub assignee: Option<Author>,
+    pub assignees: Vec<Author>,
     pub author_association: String,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub milestone: Option<Milestone>,
@@ -55,7 +55,7 @@ pub struct Comment {
     pub body_text: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub body_html: Option<String>,
-    pub user: User,
+    pub user: Author,
     pub created_at: chrono::DateTime<chrono::Utc>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub updated_at: Option<chrono::DateTime<chrono::Utc>>,
diff --git a/src/models/orgs.rs b/src/models/orgs.rs
index b4f066d5..6d9ad096 100644
--- a/src/models/orgs.rs
+++ b/src/models/orgs.rs
@@ -83,7 +83,7 @@ pub struct MembershipInvitation {
     pub role: String,
     pub organization_url: Url,
     pub organization: Organization,
-    pub user: User,
+    pub user: Author,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/src/models/pulls.rs b/src/models/pulls.rs
index 5dd7555e..e2aa71d4 100644
--- a/src/models/pulls.rs
+++ b/src/models/pulls.rs
@@ -35,7 +35,7 @@ pub struct PullRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub title: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user: Option<Box<User>>,
+    pub user: Option<Box<Author>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub body: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -63,11 +63,11 @@ pub struct PullRequest {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub merge_commit_sha: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assignee: Option<Box<User>>,
+    pub assignee: Option<Box<Author>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub assignees: Option<Vec<User>>,
+    pub assignees: Option<Vec<Author>>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub requested_reviewers: Option<Vec<User>>,
+    pub requested_reviewers: Option<Vec<Author>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub requested_teams: Option<Vec<teams::RequestedTeam>>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -94,7 +94,7 @@ pub struct Head {
     pub ref_field: String,
     pub sha: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user: Option<User>,
+    pub user: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub repo: Option<Repository>,
 }
@@ -108,7 +108,7 @@ pub struct Base {
     pub ref_field: String,
     pub sha: String,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub user: Option<User>,
+    pub user: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub repo: Option<Repository>,
 }
@@ -197,7 +197,7 @@ pub struct Review {
     pub id: ReviewId,
     pub node_id: String,
     pub html_url: Url,
-    pub user: Option<User>,
+    pub user: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub body: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -244,7 +244,7 @@ pub struct Comment {
     pub original_commit_id: String,
     #[serde(default)]
     pub in_reply_to_id: Option<u64>,
-    pub user: Option<User>,
+    pub user: Option<Author>,
     pub body: String,
     pub created_at: chrono::DateTime<chrono::Utc>,
     pub updated_at: chrono::DateTime<chrono::Utc>,
diff --git a/src/models/reactions.rs b/src/models/reactions.rs
index 4d08c38c..cc49c14d 100644
--- a/src/models/reactions.rs
+++ b/src/models/reactions.rs
@@ -25,7 +25,7 @@ pub enum ReactionContent {
 pub struct Reaction {
     pub id: ReactionId,
     pub node_id: String,
-    pub user: User,
+    pub user: Author,
     pub content: ReactionContent,
     pub created_at: chrono::DateTime<chrono::Utc>,
 }
diff --git a/src/models/repos.rs b/src/models/repos.rs
index e4ddbe34..6798a8c3 100644
--- a/src/models/repos.rs
+++ b/src/models/repos.rs
@@ -30,8 +30,8 @@ pub struct RepoCommit {
     pub html_url: String,
     pub comments_url: String,
     pub commit: RepoCommitPage,
-    pub author: Option<User>,
-    pub committer: Option<User>,
+    pub author: Option<Author>,
+    pub committer: Option<Author>,
     pub parents: Vec<Commit>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -119,16 +119,16 @@ pub struct Commit {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub comments_url: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub author: Option<GitUser>,
+    pub author: Option<Author>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub committer: Option<GitUser>,
+    pub committer: Option<Author>,
 }
 
 /// The author of a commit, identified by its name and email, as well as (optionally) a time
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct GitUserTime {
     #[serde(flatten)]
-    pub user: GitUser,
+    pub user: CommitAuthor,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     pub date: Option<DateTime<Utc>>,
@@ -137,7 +137,7 @@ pub struct GitUserTime {
 /// The author of a commit, identified by its name and email.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
-pub struct GitUser {
+pub struct CommitAuthor {
     pub name: String,
     pub email: String,
 }
@@ -292,7 +292,7 @@ pub struct Release {
     pub prerelease: bool,
     pub created_at: Option<DateTime<Utc>>,
     pub published_at: Option<DateTime<Utc>>,
-    pub author: crate::models::User,
+    pub author: crate::models::Author,
     pub assets: Vec<Asset>,
 }
 
@@ -311,7 +311,7 @@ pub struct Asset {
     pub download_count: i64,
     pub created_at: DateTime<Utc>,
     pub updated_at: DateTime<Utc>,
-    pub uploader: User,
+    pub uploader: CommitAuthor,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/src/models/teams.rs b/src/models/teams.rs
index 265cdc98..ff9dad7c 100644
--- a/src/models/teams.rs
+++ b/src/models/teams.rs
@@ -31,7 +31,7 @@ pub struct Team {
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 #[non_exhaustive]
 pub struct RequestedReviewers {
-    pub users: Vec<User>,
+    pub users: Vec<Author>,
     pub teams: Vec<Team>,
 }
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -71,7 +71,7 @@ pub struct TeamInvitation {
     pub failed_at: Option<chrono::DateTime<chrono::Utc>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub failed_reason: Option<String>,
-    pub inviter: User,
+    pub inviter: Author,
     pub team_count: u32,
     pub node_id: String,
     pub invitation_teams_url: String,
diff --git a/src/models/workflows.rs b/src/models/workflows.rs
index f9d4c276..4dfc1698 100644
--- a/src/models/workflows.rs
+++ b/src/models/workflows.rs
@@ -59,8 +59,8 @@ pub struct HeadCommit {
     pub tree_id: String,
     pub message: String,
     pub timestamp: chrono::DateTime<chrono::Utc>,
-    pub author: super::repos::GitUser,
-    pub committer: super::repos::GitUser,
+    pub author: super::repos::CommitAuthor,
+    pub committer: super::repos::CommitAuthor,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/tests/org_members_tests.rs b/tests/org_members_tests.rs
index b2be64b8..80f1d69d 100644
--- a/tests/org_members_tests.rs
+++ b/tests/org_members_tests.rs
@@ -2,7 +2,7 @@
 mod mock_error;
 
 use mock_error::setup_error_handler;
-use octocrab::{models::User, Octocrab, Page};
+use octocrab::{models::Author, Octocrab, Page};
 use serde::{Deserialize, Serialize};
 use wiremock::{
     matchers::{method, path},
@@ -39,7 +39,7 @@ const ORG: &str = "org";
 
 #[tokio::test]
 async fn should_return_page_with_users() {
-    let org_members: User =
+    let org_members: Author =
         serde_json::from_str(include_str!("resources/org_members.json")).unwrap();
     let login: String = org_members.login.clone();
     let page_response = FakePage {
diff --git a/tests/team_members_tests.rs b/tests/team_members_tests.rs
index 8c2e2f2b..1a3320fd 100644
--- a/tests/team_members_tests.rs
+++ b/tests/team_members_tests.rs
@@ -2,7 +2,7 @@
 mod mock_error;
 
 use mock_error::setup_error_handler;
-use octocrab::{models::User, Octocrab, Page};
+use octocrab::{models::Author, Octocrab, Page};
 use serde::{Deserialize, Serialize};
 use wiremock::{
     matchers::{method, path},
@@ -44,7 +44,7 @@ const TEAM: &str = "team-name";
 
 #[tokio::test]
 async fn should_return_page_with_users() {
-    let team_members: User =
+    let team_members: Author =
         serde_json::from_str(include_str!("resources/team_members.json")).unwrap();
     let page_response = FakePage {
         items: vec![team_members],