diff --git a/netbox/circuits/graphql/schema.py b/netbox/circuits/graphql/schema.py
index 3cf2cd52e..5d28a9cbf 100644
--- a/netbox/circuits/graphql/schema.py
+++ b/netbox/circuits/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class CircuitsQueryOld:
+class CircuitsQueryV1:
     circuit: CircuitType = strawberry_django.field()
     circuit_list: List[CircuitType] = strawberry_django.field()
 
diff --git a/netbox/core/graphql/schema.py b/netbox/core/graphql/schema.py
index d82944e29..a10b2c457 100644
--- a/netbox/core/graphql/schema.py
+++ b/netbox/core/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class CoreQueryOld:
+class CoreQueryV1:
     data_file: DataFileType = strawberry_django.field()
     data_file_list: List[DataFileType] = strawberry_django.field()
 
diff --git a/netbox/dcim/graphql/schema.py b/netbox/dcim/graphql/schema.py
index 7a07b7e60..d42914533 100644
--- a/netbox/dcim/graphql/schema.py
+++ b/netbox/dcim/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class DCIMQueryOld:
+class DCIMQueryV1:
     cable: CableType = strawberry_django.field()
     cable_list: List[CableType] = strawberry_django.field()
 
diff --git a/netbox/extras/graphql/schema.py b/netbox/extras/graphql/schema.py
index fe251bc5e..992a025b3 100644
--- a/netbox/extras/graphql/schema.py
+++ b/netbox/extras/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class ExtrasQueryOld:
+class ExtrasQueryV1:
     config_context: ConfigContextType = strawberry_django.field()
     config_context_list: List[ConfigContextType] = strawberry_django.field()
 
diff --git a/netbox/ipam/graphql/schema.py b/netbox/ipam/graphql/schema.py
index 5185f700e..8a372b25f 100644
--- a/netbox/ipam/graphql/schema.py
+++ b/netbox/ipam/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class IPAMQueryOld:
+class IPAMQueryV1:
     asn: ASNType = strawberry_django.field()
     asn_list: List[ASNType] = strawberry_django.field()
 
diff --git a/netbox/netbox/graphql/schema.py b/netbox/netbox/graphql/schema.py
index 185167b8d..3fda33d59 100644
--- a/netbox/netbox/graphql/schema.py
+++ b/netbox/netbox/graphql/schema.py
@@ -4,17 +4,17 @@ from strawberry_django.optimizer import DjangoOptimizerExtension
 from strawberry.extensions import MaxAliasesLimiter
 from strawberry.schema.config import StrawberryConfig
 
-from circuits.graphql.schema import CircuitsQuery, CircuitsQueryOld
-from core.graphql.schema import CoreQuery, CoreQueryOld
-from dcim.graphql.schema import DCIMQuery, DCIMQueryOld
-from extras.graphql.schema import ExtrasQuery, ExtrasQueryOld
-from ipam.graphql.schema import IPAMQuery, IPAMQueryOld
+from circuits.graphql.schema import CircuitsQuery, CircuitsQueryV1
+from core.graphql.schema import CoreQuery, CoreQueryV1
+from dcim.graphql.schema import DCIMQuery, DCIMQueryV1
+from extras.graphql.schema import ExtrasQuery, ExtrasQueryV1
+from ipam.graphql.schema import IPAMQuery, IPAMQueryV1
 from netbox.registry import registry
-from tenancy.graphql.schema import TenancyQuery, TenancyQueryOld
-from users.graphql.schema import UsersQuery, UsersQueryOld
-from virtualization.graphql.schema import VirtualizationQuery, VirtualizationQueryOld
-from vpn.graphql.schema import VPNQuery, VPNQueryOld
-from wireless.graphql.schema import WirelessQuery, WirelessQueryOld
+from tenancy.graphql.schema import TenancyQuery, TenancyQueryV1
+from users.graphql.schema import UsersQuery, UsersQueryV1
+from virtualization.graphql.schema import VirtualizationQuery, VirtualizationQueryV1
+from vpn.graphql.schema import VPNQuery, VPNQueryV1
+from wireless.graphql.schema import WirelessQuery, WirelessQueryV1
 
 __all__ = (
     'Query',
@@ -27,16 +27,16 @@ __all__ = (
 
 @strawberry.type
 class QueryV1(
-    UsersQueryOld,
-    CircuitsQueryOld,
-    CoreQueryOld,
-    DCIMQueryOld,
-    ExtrasQueryOld,
-    IPAMQueryOld,
-    TenancyQueryOld,
-    VirtualizationQueryOld,
-    VPNQueryOld,
-    WirelessQueryOld,
+    UsersQueryV1,
+    CircuitsQueryV1,
+    CoreQueryV1,
+    DCIMQueryV1,
+    ExtrasQueryV1,
+    IPAMQueryV1,
+    TenancyQueryV1,
+    VirtualizationQueryV1,
+    VPNQueryV1,
+    WirelessQueryV1,
     *registry['plugins']['graphql_schemas'],  # Append plugin schemas
 ):
     """Query class for GraphQL API v1"""
diff --git a/netbox/tenancy/graphql/schema.py b/netbox/tenancy/graphql/schema.py
index 4bc826be3..84c174922 100644
--- a/netbox/tenancy/graphql/schema.py
+++ b/netbox/tenancy/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class TenancyQueryOld:
+class TenancyQueryV1:
     tenant: TenantType = strawberry_django.field()
     tenant_list: List[TenantType] = strawberry_django.field()
 
diff --git a/netbox/users/graphql/schema.py b/netbox/users/graphql/schema.py
index f9827b905..7175570c8 100644
--- a/netbox/users/graphql/schema.py
+++ b/netbox/users/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class UsersQueryOld:
+class UsersQueryV1:
     group: GroupType = strawberry_django.field()
     group_list: List[GroupType] = strawberry_django.field()
 
diff --git a/netbox/virtualization/graphql/schema.py b/netbox/virtualization/graphql/schema.py
index 2677c3549..86991bd51 100644
--- a/netbox/virtualization/graphql/schema.py
+++ b/netbox/virtualization/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class VirtualizationQueryOld:
+class VirtualizationQueryV1:
     cluster: ClusterType = strawberry_django.field()
     cluster_list: List[ClusterType] = strawberry_django.field()
 
diff --git a/netbox/vpn/graphql/schema.py b/netbox/vpn/graphql/schema.py
index 9e8e8979f..1dbe911c6 100644
--- a/netbox/vpn/graphql/schema.py
+++ b/netbox/vpn/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class VPNQueryOld:
+class VPNQueryV1:
     ike_policy: IKEPolicyType = strawberry_django.field()
     ike_policy_list: List[IKEPolicyType] = strawberry_django.field()
 
diff --git a/netbox/wireless/graphql/schema.py b/netbox/wireless/graphql/schema.py
index 7c88fdbec..f569850fa 100644
--- a/netbox/wireless/graphql/schema.py
+++ b/netbox/wireless/graphql/schema.py
@@ -8,7 +8,7 @@ from .types import *
 
 
 @strawberry.type(name="Query")
-class WirelessQueryOld:
+class WirelessQueryV1:
     wireless_lan: WirelessLANType = strawberry_django.field()
     wireless_lan_list: List[WirelessLANType] = strawberry_django.field()