diff --git a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/GetUserNameByNodeId.graphql b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/GetUserNameByNodeId.graphql
deleted file mode 100644
index 5565345e8a..0000000000
--- a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/GetUserNameByNodeId.graphql
+++ /dev/null
@@ -1,8 +0,0 @@
-query GetUserNameByNodeId($id: ID!) {
-  node(id: $id) {
-    ... on UserName {
-      id
-      name
-    }
-  }
-}
diff --git a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUserGroups.graphql b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUserGroups.graphql
index 3c043fa184..8ffd586d55 100644
--- a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUserGroups.graphql
+++ b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUserGroups.graphql
@@ -1,7 +1,7 @@
 query ListUserGroups {
   swarm {
     userGroups {
-      queryableGroups {
+      queryable {
         totalCount
         nodes {
           id
diff --git a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUsers.graphql b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUsers.graphql
index 1553df9fc0..c2f0b4dcf7 100644
--- a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUsers.graphql
+++ b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/ListUsers.graphql
@@ -1,7 +1,7 @@
 query ListUsers {
   swarm {
     users {
-      queryableUsers {
+      queryable {
         nodes {
           id
         }
diff --git a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/PageUserIds.graphql b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/PageUserIds.graphql
index 8db5d7db4a..802507ec16 100644
--- a/src/Tgstation.Server.Client.GraphQL/GQL/Queries/PageUserIds.graphql
+++ b/src/Tgstation.Server.Client.GraphQL/GQL/Queries/PageUserIds.graphql
@@ -1,7 +1,7 @@
 query PageUserIds($first: Int, $after: String) {
   swarm {
     users {
-      queryableUsers(first: $first, after: $after) {
+      queryable(first: $first, after: $after) {
         pageInfo {
           endCursor
           hasNextPage
diff --git a/src/Tgstation.Server.Host/GraphQL/Types/UserGroup.cs b/src/Tgstation.Server.Host/GraphQL/Types/UserGroup.cs
index f97f4eefdb..523d679a06 100644
--- a/src/Tgstation.Server.Host/GraphQL/Types/UserGroup.cs
+++ b/src/Tgstation.Server.Host/GraphQL/Types/UserGroup.cs
@@ -83,7 +83,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		[UseFiltering]
 		[UseSorting]
 		[Cost(Costs.NonIndexedQueryable)]
-		public async ValueTask<IQueryable<User>> QueryableUsers(
+		public async ValueTask<IQueryable<User>> Users(
 			[Service] IGraphQLAuthorityInvoker<IUserAuthority> userAuthority)
 		{
 			ArgumentNullException.ThrowIfNull(userAuthority);
diff --git a/tests/Tgstation.Server.Tests/Live/UsersTest.cs b/tests/Tgstation.Server.Tests/Live/UsersTest.cs
index 56cb11529a..ac406e1d6e 100644
--- a/tests/Tgstation.Server.Tests/Live/UsersTest.cs
+++ b/tests/Tgstation.Server.Tests/Live/UsersTest.cs
@@ -263,14 +263,12 @@ namespace Tgstation.Server.Tests.Live
 				{
 					var result = await client.RunOperation(gql => gql.ListUsers.ExecuteAsync(cancellationToken), cancellationToken);
 					result.EnsureNoErrors();
-					var users = result.Data.Swarm.Users.QueryableUsers;
+					var users = result.Data.Swarm.Users.Queryable;
 					Assert.IsTrue(users.Nodes.Count > 0);
 					// Can't assert this, there's a race condition
 					// Assert.AreEqual(Math.Min(ApiController.DefaultPageSize, users.TotalCount), users.Nodes.Count);
 					Assert.IsTrue(Math.Min(ApiController.DefaultPageSize, users.TotalCount) >= users.Nodes.Count);
 
-					var tgsUserResult = await client.RunOperation(gql => gql.GetUserNameByNodeId.ExecuteAsync(gqlUser.Swarm.Users.Current.CreatedBy.Id, cancellationToken), cancellationToken);
-					tgsUserResult.EnsureNoErrors();
 					var tgsUserResult2 = await client.RunOperation(gql => gql.GetUserById.ExecuteAsync(gqlUser.Swarm.Users.Current.CreatedBy.Id, cancellationToken), cancellationToken);
 					Assert.IsTrue(tgsUserResult2.IsErrorResult());
 
@@ -376,7 +374,7 @@ namespace Tgstation.Server.Tests.Live
 						gql => gql.ListUserGroups.ExecuteAsync(cancellationToken),
 						cancellationToken);
 
-					var groups = groupsResult.Swarm.UserGroups.QueryableGroups;
+					var groups = groupsResult.Swarm.UserGroups.Queryable;
 					Assert.AreEqual(2, groups.TotalCount);
 
 					foreach (var igroup in groups.Nodes)
@@ -391,7 +389,7 @@ namespace Tgstation.Server.Tests.Live
 						gql => gql.ListUserGroups.ExecuteAsync(cancellationToken),
 						cancellationToken);
 
-					groups = groupsResult.Swarm.UserGroups.QueryableGroups;
+					groups = groupsResult.Swarm.UserGroups.Queryable;
 					Assert.AreEqual(1, groups.TotalCount);
 
 					foreach (var igroup in groups.Nodes)
@@ -681,7 +679,7 @@ namespace Tgstation.Server.Tests.Live
 								cancellationToken))
 								.Swarm
 								.Users
-								.QueryableUsers;
+								.Queryable;
 
 							if (!isLastIteration || exactMatch)
 								Assert.AreEqual(outputPageSize, queryable.Nodes.Count);
@@ -704,7 +702,7 @@ namespace Tgstation.Server.Tests.Live
 						{
 							// special case
 							result.EnsureNoErrors();
-							Assert.AreEqual(0, result.Data.Swarm.Users.QueryableUsers.Nodes.Count);
+							Assert.AreEqual(0, result.Data.Swarm.Users.Queryable.Nodes.Count);
 							return;
 						}