diff --git a/plugins/github/resources/graphql/fragment/actor.graphql b/plugins/github/resources/graphql/fragment/actor.graphql
index ba3574d19874..2c98dd09c518 100644
--- a/plugins/github/resources/graphql/fragment/actor.graphql
+++ b/plugins/github/resources/graphql/fragment/actor.graphql
@@ -1,13 +1,9 @@
 fragment actor on Actor {
+  ...actorInfo
+
   ... on User {
     ...userInfo
   }
-  ... on Bot {
-    ...botInfo
-  }
-  ... on Mannequin {
-    ...mannequinInfo
-  }
   ... on EnterpriseUserAccount {
     ...enterpriseUserAccountInfo
   }
diff --git a/plugins/github/resources/graphql/fragment/botInfo.graphql b/plugins/github/resources/graphql/fragment/botInfo.graphql
deleted file mode 100644
index c22497b07f80..000000000000
--- a/plugins/github/resources/graphql/fragment/botInfo.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-fragment botInfo on Bot {
-  ...actorInfo
-}
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/enterpriseUserAccountInfo.graphql b/plugins/github/resources/graphql/fragment/enterpriseUserAccountInfo.graphql
index d0d957f3c23f..20675f6585e8 100644
--- a/plugins/github/resources/graphql/fragment/enterpriseUserAccountInfo.graphql
+++ b/plugins/github/resources/graphql/fragment/enterpriseUserAccountInfo.graphql
@@ -1,4 +1,3 @@
 fragment enterpriseUserAccountInfo on EnterpriseUserAccount {
-  ...actorInfo
   name
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/gitActorInfo.graphql b/plugins/github/resources/graphql/fragment/gitActorInfo.graphql
index fc5021336e6b..625d908b3e7c 100644
--- a/plugins/github/resources/graphql/fragment/gitActorInfo.graphql
+++ b/plugins/github/resources/graphql/fragment/gitActorInfo.graphql
@@ -4,6 +4,6 @@ fragment gitActorInfo on GitActor {
   avatarUrl
   date
   user {
-    ...userInfo
+    ...user
   }
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/mannequinInfo.graphql b/plugins/github/resources/graphql/fragment/mannequinInfo.graphql
deleted file mode 100644
index acae9e53ded9..000000000000
--- a/plugins/github/resources/graphql/fragment/mannequinInfo.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-fragment mannequinInfo on Mannequin {
-  ...actorInfo
-}
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/organizationInfo.graphql b/plugins/github/resources/graphql/fragment/organizationInfo.graphql
index 6f3810f8f20a..9364f5ebbe3a 100644
--- a/plugins/github/resources/graphql/fragment/organizationInfo.graphql
+++ b/plugins/github/resources/graphql/fragment/organizationInfo.graphql
@@ -1,4 +1,3 @@
 fragment organizationInfo on Organization {
-  ...actorInfo
   name
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/pullRequestInfoShort.graphql b/plugins/github/resources/graphql/fragment/pullRequestInfoShort.graphql
index f4f963b84641..67dbc9aecd7e 100644
--- a/plugins/github/resources/graphql/fragment/pullRequestInfoShort.graphql
+++ b/plugins/github/resources/graphql/fragment/pullRequestInfoShort.graphql
@@ -17,7 +17,7 @@ fragment pullRequestInfoShort on PullRequest {
 
   assignees(first: 100) {
     nodes {
-      ...userInfo
+      ...user
     }
   }
   labels(first: 100) {
diff --git a/plugins/github/resources/graphql/fragment/pullRequestReviewer.graphql b/plugins/github/resources/graphql/fragment/pullRequestReviewer.graphql
index fab72660544b..39300f9f0038 100644
--- a/plugins/github/resources/graphql/fragment/pullRequestReviewer.graphql
+++ b/plugins/github/resources/graphql/fragment/pullRequestReviewer.graphql
@@ -1,14 +1,13 @@
 fragment pullRequestReviewer on RequestedReviewer {
+  ... on Actor {
+    ...actorInfo
+  }
   ... on User {
     ...userInfo
   }
   ... on Team {
     ...teamInfo
   }
-  ... on Mannequin {
-    ...mannequinInfo
-  }
-  ... on Bot {
-    ...botInfo
-  }
+
+  # For future enthusiasts: be careful with adding ... on Bot, as it's been added only in GHE 3.11
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/reaction.graphql b/plugins/github/resources/graphql/fragment/reaction.graphql
index 2d9475886ac3..fe78ecd6efc9 100644
--- a/plugins/github/resources/graphql/fragment/reaction.graphql
+++ b/plugins/github/resources/graphql/fragment/reaction.graphql
@@ -1,6 +1,6 @@
 fragment reaction on Reaction {
   content
   user {
-    ...userInfo
+    ...user
   }
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/user.graphql b/plugins/github/resources/graphql/fragment/user.graphql
new file mode 100644
index 000000000000..d2e2d74ec783
--- /dev/null
+++ b/plugins/github/resources/graphql/fragment/user.graphql
@@ -0,0 +1,4 @@
+fragment user on User {
+  ...actorInfo
+  ...userInfo
+}
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/fragment/userInfo.graphql b/plugins/github/resources/graphql/fragment/userInfo.graphql
index 55da324acdda..e52fdc443492 100644
--- a/plugins/github/resources/graphql/fragment/userInfo.graphql
+++ b/plugins/github/resources/graphql/fragment/userInfo.graphql
@@ -1,4 +1,3 @@
 fragment userInfo on User {
-  ...actorInfo
   name
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/query/findUser.graphql b/plugins/github/resources/graphql/query/findUser.graphql
index 458c1ebfbe2b..ae2dadaf46d7 100644
--- a/plugins/github/resources/graphql/query/findUser.graphql
+++ b/plugins/github/resources/graphql/query/findUser.graphql
@@ -1,6 +1,6 @@
 query($login: String!) {
   user(login: $login) {
     __typename
-    ...userInfo
+    ...user
   }
 }
\ No newline at end of file
diff --git a/plugins/github/resources/graphql/query/pullRequestTimeline.graphql b/plugins/github/resources/graphql/query/pullRequestTimeline.graphql
index 7e903e5c9972..549091428d0d 100644
--- a/plugins/github/resources/graphql/query/pullRequestTimeline.graphql
+++ b/plugins/github/resources/graphql/query/pullRequestTimeline.graphql
@@ -80,7 +80,7 @@ fragment assignedEvent on AssignedEvent {
   }
   createdAt
   user {
-    ...userInfo
+    ...user
   }
 }
 
@@ -90,7 +90,7 @@ fragment unassignedEvent on UnassignedEvent {
   }
   createdAt
   user {
-    ...userInfo
+    ...user
   }
 }
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHBot.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHBot.kt
index 59edd77ef974..9dc96857f206 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHBot.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHBot.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.github.api.data
 import com.intellij.collaboration.api.dto.GraphQLFragment
 import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
 
-@GraphQLFragment("/graphql/fragment/botInfo.graphql")
+@GraphQLFragment("/graphql/fragment/actorInfo.graphql")
 class GHBot(
   id: String,
   override val login: String,
diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHMannequin.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHMannequin.kt
index 5201cfaac82c..af92dfd1bd0a 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHMannequin.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHMannequin.kt
@@ -4,7 +4,7 @@ package org.jetbrains.plugins.github.api.data
 import com.intellij.collaboration.api.dto.GraphQLFragment
 import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
 
-@GraphQLFragment("/graphql/fragment/mannequinInfo.graphql")
+@GraphQLFragment("/graphql/fragment/actorInfo.graphql")
 class GHMannequin(
   id: String,
   override val login: String,
diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHUser.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHUser.kt
index d625fce36f5d..0abb4221c793 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/api/data/GHUser.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/GHUser.kt
@@ -5,7 +5,7 @@ import com.intellij.collaboration.api.dto.GraphQLFragment
 import com.intellij.openapi.util.NlsSafe
 import org.jetbrains.plugins.github.api.data.pullrequest.GHPullRequestRequestedReviewer
 
-@GraphQLFragment("/graphql/fragment/userInfo.graphql")
+@GraphQLFragment("/graphql/fragment/user.graphql")
 class GHUser(id: String,
              @NlsSafe override val login: String,
              override val url: String,