diff --git a/packages/graphql/src/schema/fieldTypes.ts b/packages/graphql/src/schema/fieldTypes.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/graphql/src/schema/make-augmented-schema.ts b/packages/graphql/src/schema/make-augmented-schema.ts
index 2b3b6513f9..3b6dd6ce6a 100644
--- a/packages/graphql/src/schema/make-augmented-schema.ts
+++ b/packages/graphql/src/schema/make-augmented-schema.ts
@@ -1165,7 +1165,7 @@ function makeAugmentedSchema(
                 },
             });
 
-            const baseTypeName = `${node.name}${n.name}${rel.fieldName}`;
+            const baseTypeName = `${node.name}${n.name}${upperFirst(rel.fieldName)}`;
             const fieldAggregationComposer = new FieldAggregationComposer(composer, aggregationSelectionTypes);
             const aggregationTypeObject = fieldAggregationComposer.createAggregationTypeObject(
                 baseTypeName,
diff --git a/packages/graphql/src/translate/field-aggregations/create-field-aggregation.ts b/packages/graphql/src/translate/field-aggregations/create-field-aggregation.ts
index cdd966eee5..d6bf5e8e57 100644
--- a/packages/graphql/src/translate/field-aggregations/create-field-aggregation.ts
+++ b/packages/graphql/src/translate/field-aggregations/create-field-aggregation.ts
@@ -18,6 +18,7 @@
  */
 
 import { ResolveTree } from "graphql-parse-resolve-info";
+import { upperFirst } from "graphql-compose";
 import { Node, Relationship } from "../../classes";
 import { Context, RelationField } from "../../types";
 import {
@@ -58,6 +59,7 @@ export function createFieldAggregation({
     const relationAggregationField = node.relationFields.find((x) => {
         return `${x.fieldName}Aggregate` === field.name;
     });
+
     const connectionField = node.connectionFields.find((x) => {
         return `${relationAggregationField?.fieldName}Connection` === x.fieldName;
     });
@@ -68,7 +70,7 @@ export function createFieldAggregation({
 
     if (!referenceNode || !referenceRelation) return undefined;
 
-    const fieldPathBase = `${node.name}${referenceNode.name}${relationAggregationField.fieldName}`;
+    const fieldPathBase = `${node.name}${referenceNode.name}${upperFirst(relationAggregationField.fieldName)}`;
     const aggregationFields = getAggregationFields(fieldPathBase, field);
 
     const authData = createFieldAggregationAuth({
diff --git a/packages/graphql/tests/schema/aggregations.test.ts b/packages/graphql/tests/schema/aggregations.test.ts
index 333f005552..f094fd30f6 100644
--- a/packages/graphql/tests/schema/aggregations.test.ts
+++ b/packages/graphql/tests/schema/aggregations.test.ts
@@ -615,7 +615,7 @@ describe("Aggregations", () => {
 
             type Post {
               likes(options: UserOptions, where: UserWhere): [User]
-              likesAggregate: PostUserlikesAggregationSelection
+              likesAggregate: PostUserLikesAggregationSelection
               likesConnection(after: String, first: Int, sort: [PostLikesConnectionSort!], where: PostLikesConnectionWhere): PostLikesConnection!
               title: String
             }
@@ -1079,13 +1079,13 @@ describe("Aggregations", () => {
               title: String
             }
 
-            type PostUserlikesAggregationSelection {
+            type PostUserLikesAggregationSelection {
               count: Int!
-              edge: PostUserlikesEdgeAggregateSelection
-              node: PostUserlikesNodeAggregateSelection
+              edge: PostUserLikesEdgeAggregateSelection
+              node: PostUserLikesNodeAggregateSelection
             }
 
-            type PostUserlikesEdgeAggregateSelection {
+            type PostUserLikesEdgeAggregateSelection {
               someBigInt: BigIntAggregateSelection!
               someDateTime: DateTimeAggregateSelection!
               someDuration: DurationAggregateSelection!
@@ -1098,7 +1098,7 @@ describe("Aggregations", () => {
               someTime: TimeAggregateSelection!
             }
 
-            type PostUserlikesNodeAggregateSelection {
+            type PostUserLikesNodeAggregateSelection {
               someBigInt: BigIntAggregateSelection!
               someDateTime: DateTimeAggregateSelection!
               someDuration: DurationAggregateSelection!
diff --git a/packages/graphql/tests/schema/connections/enums.test.ts b/packages/graphql/tests/schema/connections/enums.test.ts
index 932978bee6..3f59eb3874 100644
--- a/packages/graphql/tests/schema/connections/enums.test.ts
+++ b/packages/graphql/tests/schema/connections/enums.test.ts
@@ -80,7 +80,7 @@ describe("Enums", () => {
 
             type Actor {
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: ActorMoviemoviesAggregationSelection
+              moviesAggregate: ActorMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
               name: String!
             }
@@ -111,12 +111,12 @@ describe("Enums", () => {
               movies: [ActorMoviesDisconnectFieldInput!]
             }
 
-            type ActorMoviemoviesAggregationSelection {
+            type ActorMovieMoviesAggregationSelection {
               count: Int!
-              node: ActorMoviemoviesNodeAggregateSelection
+              node: ActorMovieMoviesNodeAggregateSelection
             }
 
-            type ActorMoviemoviesNodeAggregateSelection {
+            type ActorMovieMoviesNodeAggregateSelection {
               title: StringAggregateSelection!
             }
 
@@ -287,17 +287,17 @@ describe("Enums", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               title: String!
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              node: MovieActoractorsNodeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/connections/sort.test.ts b/packages/graphql/tests/schema/connections/sort.test.ts
index a7202add4c..a7e1eea630 100644
--- a/packages/graphql/tests/schema/connections/sort.test.ts
+++ b/packages/graphql/tests/schema/connections/sort.test.ts
@@ -77,7 +77,7 @@ describe("Sort", () => {
             type Node1 {
               property: String!
               relatedTo(options: Node2Options, where: Node2Where): [Node2!]!
-              relatedToAggregate: Node1Node2relatedToAggregationSelection
+              relatedToAggregate: Node1Node2RelatedToAggregationSelection
               relatedToConnection(after: String, first: Int, where: Node1RelatedToConnectionWhere): Node1RelatedToConnection!
             }
 
@@ -107,7 +107,7 @@ describe("Sort", () => {
               relatedTo: [Node1RelatedToDisconnectFieldInput!]
             }
 
-            type Node1Node2relatedToAggregationSelection {
+            type Node1Node2RelatedToAggregationSelection {
               count: Int!
             }
 
@@ -219,7 +219,7 @@ describe("Sort", () => {
 
             type Node2 {
               relatedTo(options: Node1Options, where: Node1Where): [Node1!]!
-              relatedToAggregate: Node2Node1relatedToAggregationSelection
+              relatedToAggregate: Node2Node1RelatedToAggregationSelection
               relatedToConnection(after: String, first: Int, sort: [Node2RelatedToConnectionSort!], where: Node2RelatedToConnectionWhere): Node2RelatedToConnection!
             }
 
@@ -247,12 +247,12 @@ describe("Sort", () => {
               relatedTo: [Node2RelatedToDisconnectFieldInput!]
             }
 
-            type Node2Node1relatedToAggregationSelection {
+            type Node2Node1RelatedToAggregationSelection {
               count: Int!
-              node: Node2Node1relatedToNodeAggregateSelection
+              node: Node2Node1RelatedToNodeAggregateSelection
             }
 
-            type Node2Node1relatedToNodeAggregateSelection {
+            type Node2Node1RelatedToNodeAggregateSelection {
               property: StringAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/connections/unions.test.ts b/packages/graphql/tests/schema/connections/unions.test.ts
index 4b42a65b37..ff63b8e5bf 100644
--- a/packages/graphql/tests/schema/connections/unions.test.ts
+++ b/packages/graphql/tests/schema/connections/unions.test.ts
@@ -290,7 +290,7 @@ describe("Unions", () => {
 
             type Book {
               author(options: AuthorOptions, where: AuthorWhere): [Author!]!
-              authorAggregate: BookAuthorauthorAggregationSelection
+              authorAggregate: BookAuthorAuthorAggregationSelection
               authorConnection(after: String, first: Int, sort: [BookAuthorConnectionSort!], where: BookAuthorConnectionWhere): BookAuthorConnection!
               title: String!
             }
@@ -312,6 +312,20 @@ describe("Unions", () => {
               node: BookAuthorNodeAggregationWhereInput
             }
 
+            type BookAuthorAuthorAggregationSelection {
+              count: Int!
+              edge: BookAuthorAuthorEdgeAggregateSelection
+              node: BookAuthorAuthorNodeAggregateSelection
+            }
+
+            type BookAuthorAuthorEdgeAggregateSelection {
+              words: IntAggregateSelection!
+            }
+
+            type BookAuthorAuthorNodeAggregateSelection {
+              name: StringAggregateSelection!
+            }
+
             input BookAuthorConnectFieldInput {
               connect: [AuthorConnectInput!]
               edge: WroteCreateInput!
@@ -428,20 +442,6 @@ describe("Unions", () => {
               where: BookAuthorConnectionWhere
             }
 
-            type BookAuthorauthorAggregationSelection {
-              count: Int!
-              edge: BookAuthorauthorEdgeAggregateSelection
-              node: BookAuthorauthorNodeAggregateSelection
-            }
-
-            type BookAuthorauthorEdgeAggregateSelection {
-              words: IntAggregateSelection!
-            }
-
-            type BookAuthorauthorNodeAggregateSelection {
-              name: StringAggregateSelection!
-            }
-
             input BookConnectInput {
               author: [BookAuthorConnectFieldInput!]
             }
@@ -539,7 +539,7 @@ describe("Unions", () => {
 
             type Journal {
               author(options: AuthorOptions, where: AuthorWhere): [Author!]!
-              authorAggregate: JournalAuthorauthorAggregationSelection
+              authorAggregate: JournalAuthorAuthorAggregationSelection
               authorConnection(after: String, first: Int, sort: [JournalAuthorConnectionSort!], where: JournalAuthorConnectionWhere): JournalAuthorConnection!
               subject: String!
             }
@@ -561,6 +561,20 @@ describe("Unions", () => {
               node: JournalAuthorNodeAggregationWhereInput
             }
 
+            type JournalAuthorAuthorAggregationSelection {
+              count: Int!
+              edge: JournalAuthorAuthorEdgeAggregateSelection
+              node: JournalAuthorAuthorNodeAggregateSelection
+            }
+
+            type JournalAuthorAuthorEdgeAggregateSelection {
+              words: IntAggregateSelection!
+            }
+
+            type JournalAuthorAuthorNodeAggregateSelection {
+              name: StringAggregateSelection!
+            }
+
             input JournalAuthorConnectFieldInput {
               connect: [AuthorConnectInput!]
               edge: WroteCreateInput!
@@ -677,20 +691,6 @@ describe("Unions", () => {
               where: JournalAuthorConnectionWhere
             }
 
-            type JournalAuthorauthorAggregationSelection {
-              count: Int!
-              edge: JournalAuthorauthorEdgeAggregateSelection
-              node: JournalAuthorauthorNodeAggregateSelection
-            }
-
-            type JournalAuthorauthorEdgeAggregateSelection {
-              words: IntAggregateSelection!
-            }
-
-            type JournalAuthorauthorNodeAggregateSelection {
-              name: StringAggregateSelection!
-            }
-
             input JournalConnectInput {
               author: [JournalAuthorConnectFieldInput!]
             }
diff --git a/packages/graphql/tests/schema/directives/alias.test.ts b/packages/graphql/tests/schema/directives/alias.test.ts
index e9d5d19061..761ec550ed 100644
--- a/packages/graphql/tests/schema/directives/alias.test.ts
+++ b/packages/graphql/tests/schema/directives/alias.test.ts
@@ -52,7 +52,7 @@ describe("Alias", () => {
 
             type Actor {
               actedIn(options: MovieOptions, where: MovieWhere): [Movie]
-              actedInAggregate: ActorMovieactedInAggregationSelection
+              actedInAggregate: ActorMovieActedInAggregationSelection
               actedInConnection(after: String, first: Int, sort: [ActorActedInConnectionSort!], where: ActorActedInConnectionWhere): ActorActedInConnection!
               city: String
               name: String!
@@ -291,18 +291,18 @@ describe("Alias", () => {
               actedIn: [ActorActedInDisconnectFieldInput!]
             }
 
-            type ActorMovieactedInAggregationSelection {
+            type ActorMovieActedInAggregationSelection {
               count: Int!
-              edge: ActorMovieactedInEdgeAggregateSelection
-              node: ActorMovieactedInNodeAggregateSelection
+              edge: ActorMovieActedInEdgeAggregateSelection
+              node: ActorMovieActedInNodeAggregateSelection
             }
 
-            type ActorMovieactedInEdgeAggregateSelection {
+            type ActorMovieActedInEdgeAggregateSelection {
               character: StringAggregateSelection!
               screenTime: IntAggregateSelection!
             }
 
-            type ActorMovieactedInNodeAggregateSelection {
+            type ActorMovieActedInNodeAggregateSelection {
               rating: FloatAggregateSelection!
               title: StringAggregateSelection!
             }
diff --git a/packages/graphql/tests/schema/directives/exclude.test.ts b/packages/graphql/tests/schema/directives/exclude.test.ts
index 640c61b4bb..5488125dc0 100644
--- a/packages/graphql/tests/schema/directives/exclude.test.ts
+++ b/packages/graphql/tests/schema/directives/exclude.test.ts
@@ -614,17 +614,17 @@ describe("Exclude", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               title: String
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              node: MovieActoractorsNodeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/interfaces.test.ts b/packages/graphql/tests/schema/interfaces.test.ts
index 33976fe5b3..85179ecec7 100644
--- a/packages/graphql/tests/schema/interfaces.test.ts
+++ b/packages/graphql/tests/schema/interfaces.test.ts
@@ -85,7 +85,7 @@ describe("Interfaces", () => {
               customQuery: [Movie]
               id: ID
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: MovieMoviemoviesAggregationSelection
+              moviesAggregate: MovieMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [MovieMoviesConnectionSort!], where: MovieMoviesConnectionWhere): MovieMoviesConnection!
               nodes: [MovieNode]
             }
@@ -116,12 +116,12 @@ describe("Interfaces", () => {
               movies: [MovieMoviesDisconnectFieldInput!]
             }
 
-            type MovieMoviemoviesAggregationSelection {
+            type MovieMovieMoviesAggregationSelection {
               count: Int!
-              node: MovieMoviemoviesNodeAggregateSelection
+              node: MovieMovieMoviesNodeAggregateSelection
             }
 
-            type MovieMoviemoviesNodeAggregateSelection {
+            type MovieMovieMoviesNodeAggregateSelection {
               id: IDAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/issues/162.test.ts b/packages/graphql/tests/schema/issues/162.test.ts
index e268395ee9..0f4fcd4015 100644
--- a/packages/graphql/tests/schema/issues/162.test.ts
+++ b/packages/graphql/tests/schema/issues/162.test.ts
@@ -145,7 +145,7 @@ describe("162", () => {
             type TigerJawLevel2 {
               id: ID
               part1(options: TigerJawLevel2Part1Options, where: TigerJawLevel2Part1Where): TigerJawLevel2Part1
-              part1Aggregate: TigerJawLevel2TigerJawLevel2Part1part1AggregationSelection
+              part1Aggregate: TigerJawLevel2TigerJawLevel2Part1Part1AggregationSelection
               part1Connection(after: String, first: Int, sort: [TigerJawLevel2Part1ConnectionSort!], where: TigerJawLevel2Part1ConnectionWhere): TigerJawLevel2Part1Connection!
             }
 
@@ -181,7 +181,7 @@ describe("162", () => {
             type TigerJawLevel2Part1 {
               id: ID
               tiger(options: TigerOptions, where: TigerWhere): Tiger
-              tigerAggregate: TigerJawLevel2Part1TigertigerAggregationSelection
+              tigerAggregate: TigerJawLevel2Part1TigerTigerAggregationSelection
               tigerConnection(after: String, first: Int, sort: [TigerJawLevel2Part1TigerConnectionSort!], where: TigerJawLevel2Part1TigerConnectionWhere): TigerJawLevel2Part1TigerConnection!
             }
 
@@ -369,6 +369,15 @@ describe("162", () => {
               node: Tiger!
             }
 
+            type TigerJawLevel2Part1TigerTigerAggregationSelection {
+              count: Int!
+              node: TigerJawLevel2Part1TigerTigerNodeAggregateSelection
+            }
+
+            type TigerJawLevel2Part1TigerTigerNodeAggregateSelection {
+              x: IntAggregateSelection!
+            }
+
             input TigerJawLevel2Part1TigerUpdateConnectionInput {
               node: TigerUpdateInput
             }
@@ -382,15 +391,6 @@ describe("162", () => {
               where: TigerJawLevel2Part1TigerConnectionWhere
             }
 
-            type TigerJawLevel2Part1TigertigerAggregationSelection {
-              count: Int!
-              node: TigerJawLevel2Part1TigertigerNodeAggregateSelection
-            }
-
-            type TigerJawLevel2Part1TigertigerNodeAggregateSelection {
-              x: IntAggregateSelection!
-            }
-
             input TigerJawLevel2Part1UpdateConnectionInput {
               node: TigerJawLevel2Part1UpdateInput
             }
@@ -438,12 +438,12 @@ describe("162", () => {
               id: SortDirection
             }
 
-            type TigerJawLevel2TigerJawLevel2Part1part1AggregationSelection {
+            type TigerJawLevel2TigerJawLevel2Part1Part1AggregationSelection {
               count: Int!
-              node: TigerJawLevel2TigerJawLevel2Part1part1NodeAggregateSelection
+              node: TigerJawLevel2TigerJawLevel2Part1Part1NodeAggregateSelection
             }
 
-            type TigerJawLevel2TigerJawLevel2Part1part1NodeAggregateSelection {
+            type TigerJawLevel2TigerJawLevel2Part1Part1NodeAggregateSelection {
               id: IDAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/relationship-properties.test.ts b/packages/graphql/tests/schema/relationship-properties.test.ts
index 701c8d705a..cea717537c 100644
--- a/packages/graphql/tests/schema/relationship-properties.test.ts
+++ b/packages/graphql/tests/schema/relationship-properties.test.ts
@@ -99,7 +99,7 @@ describe("Relationship-properties", () => {
 
             type Actor {
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: ActorMoviemoviesAggregationSelection
+              moviesAggregate: ActorMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
               name: String!
             }
@@ -130,17 +130,17 @@ describe("Relationship-properties", () => {
               movies: [ActorMoviesDisconnectFieldInput!]
             }
 
-            type ActorMoviemoviesAggregationSelection {
+            type ActorMovieMoviesAggregationSelection {
               count: Int!
-              edge: ActorMoviemoviesEdgeAggregateSelection
-              node: ActorMoviemoviesNodeAggregateSelection
+              edge: ActorMovieMoviesEdgeAggregateSelection
+              node: ActorMovieMoviesNodeAggregateSelection
             }
 
-            type ActorMoviemoviesEdgeAggregateSelection {
+            type ActorMovieMoviesEdgeAggregateSelection {
               screenTime: IntAggregateSelection!
             }
 
-            type ActorMoviemoviesNodeAggregateSelection {
+            type ActorMovieMoviesNodeAggregateSelection {
               title: StringAggregateSelection!
             }
 
@@ -348,22 +348,22 @@ describe("Relationship-properties", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               title: String!
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              edge: MovieActoractorsEdgeAggregateSelection
-              node: MovieActoractorsNodeAggregateSelection
+              edge: MovieActorActorsEdgeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsEdgeAggregateSelection {
+            type MovieActorActorsEdgeAggregateSelection {
               screenTime: IntAggregateSelection!
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
@@ -703,7 +703,7 @@ describe("Relationship-properties", () => {
 
             type Actor {
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: ActorMoviemoviesAggregationSelection
+              moviesAggregate: ActorMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
               name: String!
             }
@@ -734,19 +734,19 @@ describe("Relationship-properties", () => {
               movies: [ActorMoviesDisconnectFieldInput!]
             }
 
-            type ActorMoviemoviesAggregationSelection {
+            type ActorMovieMoviesAggregationSelection {
               count: Int!
-              edge: ActorMoviemoviesEdgeAggregateSelection
-              node: ActorMoviemoviesNodeAggregateSelection
+              edge: ActorMovieMoviesEdgeAggregateSelection
+              node: ActorMovieMoviesNodeAggregateSelection
             }
 
-            type ActorMoviemoviesEdgeAggregateSelection {
+            type ActorMovieMoviesEdgeAggregateSelection {
               id: IDAggregateSelection!
               screenTime: IntAggregateSelection!
               timestamp: DateTimeAggregateSelection!
             }
 
-            type ActorMoviemoviesNodeAggregateSelection {
+            type ActorMovieMoviesNodeAggregateSelection {
               title: StringAggregateSelection!
             }
 
@@ -980,24 +980,24 @@ describe("Relationship-properties", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               title: String!
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              edge: MovieActoractorsEdgeAggregateSelection
-              node: MovieActoractorsNodeAggregateSelection
+              edge: MovieActorActorsEdgeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsEdgeAggregateSelection {
+            type MovieActorActorsEdgeAggregateSelection {
               id: IDAggregateSelection!
               screenTime: IntAggregateSelection!
               timestamp: DateTimeAggregateSelection!
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
@@ -1334,7 +1334,7 @@ describe("Relationship-properties", () => {
 
             type Actor {
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: ActorMoviemoviesAggregationSelection
+              moviesAggregate: ActorMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
               name: String!
             }
@@ -1365,18 +1365,18 @@ describe("Relationship-properties", () => {
               movies: [ActorMoviesDisconnectFieldInput!]
             }
 
-            type ActorMoviemoviesAggregationSelection {
+            type ActorMovieMoviesAggregationSelection {
               count: Int!
-              edge: ActorMoviemoviesEdgeAggregateSelection
-              node: ActorMoviemoviesNodeAggregateSelection
+              edge: ActorMovieMoviesEdgeAggregateSelection
+              node: ActorMovieMoviesNodeAggregateSelection
             }
 
-            type ActorMoviemoviesEdgeAggregateSelection {
+            type ActorMovieMoviesEdgeAggregateSelection {
               id: IDAggregateSelection!
               timestamp: DateTimeAggregateSelection!
             }
 
-            type ActorMoviemoviesNodeAggregateSelection {
+            type ActorMovieMoviesNodeAggregateSelection {
               title: StringAggregateSelection!
             }
 
@@ -1580,23 +1580,23 @@ describe("Relationship-properties", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               title: String!
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              edge: MovieActoractorsEdgeAggregateSelection
-              node: MovieActoractorsNodeAggregateSelection
+              edge: MovieActorActorsEdgeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsEdgeAggregateSelection {
+            type MovieActorActorsEdgeAggregateSelection {
               id: IDAggregateSelection!
               timestamp: DateTimeAggregateSelection!
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
diff --git a/packages/graphql/tests/schema/relationship.test.ts b/packages/graphql/tests/schema/relationship.test.ts
index 99bae76317..5e01a7cbf9 100644
--- a/packages/graphql/tests/schema/relationship.test.ts
+++ b/packages/graphql/tests/schema/relationship.test.ts
@@ -120,17 +120,17 @@ describe("Relationship", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               id: ID
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              node: MovieActoractorsNodeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }
 
@@ -371,7 +371,7 @@ describe("Relationship", () => {
 
             type Actor {
               movies(options: MovieOptions, where: MovieWhere): [Movie]
-              moviesAggregate: ActorMoviemoviesAggregationSelection
+              moviesAggregate: ActorMovieMoviesAggregationSelection
               moviesConnection(after: String, first: Int, sort: [ActorMoviesConnectionSort!], where: ActorMoviesConnectionWhere): ActorMoviesConnection!
               name: String
             }
@@ -402,12 +402,12 @@ describe("Relationship", () => {
               movies: [ActorMoviesDisconnectFieldInput!]
             }
 
-            type ActorMoviemoviesAggregationSelection {
+            type ActorMovieMoviesAggregationSelection {
               count: Int!
-              node: ActorMoviemoviesNodeAggregateSelection
+              node: ActorMovieMoviesNodeAggregateSelection
             }
 
-            type ActorMoviemoviesNodeAggregateSelection {
+            type ActorMovieMoviesNodeAggregateSelection {
               id: IDAggregateSelection!
             }
 
@@ -557,17 +557,17 @@ describe("Relationship", () => {
 
             type Movie {
               actors(options: ActorOptions, where: ActorWhere): [Actor]!
-              actorsAggregate: MovieActoractorsAggregationSelection
+              actorsAggregate: MovieActorActorsAggregationSelection
               actorsConnection(after: String, first: Int, sort: [MovieActorsConnectionSort!], where: MovieActorsConnectionWhere): MovieActorsConnection!
               id: ID
             }
 
-            type MovieActoractorsAggregationSelection {
+            type MovieActorActorsAggregationSelection {
               count: Int!
-              node: MovieActoractorsNodeAggregateSelection
+              node: MovieActorActorsNodeAggregateSelection
             }
 
-            type MovieActoractorsNodeAggregateSelection {
+            type MovieActorActorsNodeAggregateSelection {
               name: StringAggregateSelection!
             }