diff --git a/dev-test/githunt/types.noNamespaces.ts b/dev-test/githunt/types.noNamespaces.ts
index b00c27a427d..40b5849d11c 100644
--- a/dev-test/githunt/types.noNamespaces.ts
+++ b/dev-test/githunt/types.noNamespaces.ts
@@ -81,7 +81,7 @@ export type Maybe<T> = T | null;
 
     createdAt: number;
 
-    comments: CommentComments[];
+    comments: (Maybe<CommentComments>)[];
 
     commentCount: number;
 
@@ -144,7 +144,7 @@ export type Maybe<T> = T | null;
 
     currentUser: Maybe<FeedCurrentUser>;
 
-    feed: Maybe<FeedFeed[]>;
+    feed: Maybe<(Maybe<FeedFeed>)[]>;
   };
 
   export type FeedCurrentUser = {
diff --git a/dev-test/githunt/types.reactApollo.noNamespaces.tsx b/dev-test/githunt/types.reactApollo.noNamespaces.tsx
index 00ee16952e7..40be3600bf2 100644
--- a/dev-test/githunt/types.reactApollo.noNamespaces.tsx
+++ b/dev-test/githunt/types.reactApollo.noNamespaces.tsx
@@ -82,7 +82,7 @@ export type Maybe<T> = T | null;
     
     createdAt: number;
     
-    comments: CommentComments[];
+    comments: (Maybe<CommentComments>)[];
     
     commentCount: number;
     
@@ -145,7 +145,7 @@ export type Maybe<T> = T | null;
     
     currentUser: Maybe<FeedCurrentUser>;
     
-    feed: Maybe<FeedFeed[]>;
+    feed: Maybe<(Maybe<FeedFeed>)[]>;
   }
 
   export type FeedCurrentUser = {
@@ -300,10 +300,11 @@ export type Maybe<T> = T | null;
     vote_value: number;
   }
 
+
+    import gql from 'graphql-tag';
+  import * as React from 'react';
 import * as ReactApollo from 'react-apollo';
-import * as React from 'react';
 
-import gql from 'graphql-tag';
 
 
 
diff --git a/dev-test/githunt/types.reactApollo.tsx b/dev-test/githunt/types.reactApollo.tsx
index ea9d625a1fa..da532423a64 100644
--- a/dev-test/githunt/types.reactApollo.tsx
+++ b/dev-test/githunt/types.reactApollo.tsx
@@ -322,10 +322,11 @@ export namespace VoteButtons {
   }
 }
 
+
+    import gql from 'graphql-tag';
+  import * as React from 'react';
 import * as ReactApollo from 'react-apollo';
-import * as React from 'react';
 
-import gql from 'graphql-tag';
 
 
 
diff --git a/dev-test/test-message/types.reactApollo.noNamespaces.tsx b/dev-test/test-message/types.reactApollo.noNamespaces.tsx
index a0f4049f949..2a5187d26fe 100644
--- a/dev-test/test-message/types.reactApollo.noNamespaces.tsx
+++ b/dev-test/test-message/types.reactApollo.noNamespaces.tsx
@@ -21,7 +21,7 @@ export interface CreateMessageInput {
   export type GetMessagesQuery = {
     __typename?: "Query";
     
-    messages: Maybe<GetMessagesMessages[]>;
+    messages: Maybe<(Maybe<GetMessagesMessages>)[]>;
   }
 
   export type GetMessagesMessages = {
@@ -95,10 +95,11 @@ export interface CreateMessageInput {
     id: string;
   } 
 
+
+    import gql from 'graphql-tag';
+  import * as React from 'react';
 import * as ReactApollo from 'react-apollo';
-import * as React from 'react';
 
-import gql from 'graphql-tag';
 
 
 
diff --git a/dev-test/test-message/types.stencilApollo.noNamespaces.tsx b/dev-test/test-message/types.stencilApollo.noNamespaces.tsx
index 84a2d2df8c8..bdf0c208169 100644
--- a/dev-test/test-message/types.stencilApollo.noNamespaces.tsx
+++ b/dev-test/test-message/types.stencilApollo.noNamespaces.tsx
@@ -21,7 +21,7 @@ export interface CreateMessageInput {
   export type GetMessagesQuery = {
     __typename?: "Query";
     
-    messages: Maybe<GetMessagesMessages[]>;
+    messages: Maybe<(Maybe<GetMessagesMessages>)[]>;
   }
 
   export type GetMessagesMessages = {
@@ -95,7 +95,6 @@ export interface CreateMessageInput {
     id: string;
   } 
 
-import { FunctionalComponent } from '@stencil/core';
 
 import gql from 'graphql-tag';
 
@@ -119,20 +118,11 @@ import gql from 'graphql-tag';
       
     
   `;
-    export interface ComponentProps {
+    export interface GetMessagesComponentProps {
         variables ?: GetMessagesVariables;
         onReady ?: import('stencil-apollo/dist/types/components/apollo-query/types').OnQueryReadyFn<GetMessagesQuery, GetMessagesVariables>;
     }
-     export const GetMessagesComponent: FunctionalComponent<ComponentProps> = (props, children) => {
-        return (
-            <apollo-query
-            query={ GetMessagesDocument }
-            {...props}
-            >
-                {children}
-            </apollo-query>
-        );
-    }
+     export const GetMessagesComponent = (props: GetMessagesComponentProps) => <apollo-query query={ GetMessagesDocument } {...props} />;
     export const CreateMessageDocument = gql`
     mutation CreateMessage($args: CreateMessageInput!) {
   createMessage(args: $args) {
@@ -143,20 +133,11 @@ import gql from 'graphql-tag';
       
     
   `;
-    export interface ComponentProps {
+    export interface CreateMessageComponentProps {
         variables ?: CreateMessageVariables;
         onReady ?: import('stencil-apollo/dist/types/components/apollo-mutation/types').OnMutationReadyFn<CreateMessageMutation, CreateMessageVariables>;
     }
-     export const CreateMessageComponent: FunctionalComponent<ComponentProps> = (props, children) => {
-        return (
-            <apollo-mutation
-            mutation={ CreateMessageDocument }
-            {...props}
-            >
-                {children}
-            </apollo-mutation>
-        );
-    }
+     export const CreateMessageComponent = (props: CreateMessageComponentProps) => <apollo-mutation mutation={ CreateMessageDocument } {...props} />;
     export const DeclineDocument = gql`
     mutation Decline($id: ID!, $reason: String!) {
   decline(id: $id, reason: $reason) {
@@ -167,20 +148,11 @@ import gql from 'graphql-tag';
       
     
   `;
-    export interface ComponentProps {
+    export interface DeclineComponentProps {
         variables ?: DeclineVariables;
         onReady ?: import('stencil-apollo/dist/types/components/apollo-mutation/types').OnMutationReadyFn<DeclineMutation, DeclineVariables>;
     }
-     export const DeclineComponent: FunctionalComponent<ComponentProps> = (props, children) => {
-        return (
-            <apollo-mutation
-            mutation={ DeclineDocument }
-            {...props}
-            >
-                {children}
-            </apollo-mutation>
-        );
-    }
+     export const DeclineComponent = (props: DeclineComponentProps) => <apollo-mutation mutation={ DeclineDocument } {...props} />;
     export const ApproveDocument = gql`
     mutation Approve($id: ID!) {
   approve(id: $id) {
@@ -191,20 +163,11 @@ import gql from 'graphql-tag';
       
     
   `;
-    export interface ComponentProps {
+    export interface ApproveComponentProps {
         variables ?: ApproveVariables;
         onReady ?: import('stencil-apollo/dist/types/components/apollo-mutation/types').OnMutationReadyFn<ApproveMutation, ApproveVariables>;
     }
-     export const ApproveComponent: FunctionalComponent<ComponentProps> = (props, children) => {
-        return (
-            <apollo-mutation
-            mutation={ ApproveDocument }
-            {...props}
-            >
-                {children}
-            </apollo-mutation>
-        );
-    }
+     export const ApproveComponent = (props: ApproveComponentProps) => <apollo-mutation mutation={ ApproveDocument } {...props} />;
     export const EscalateDocument = gql`
     mutation Escalate($id: ID!) {
   escalate(id: $id) {
@@ -215,17 +178,8 @@ import gql from 'graphql-tag';
       
     
   `;
-    export interface ComponentProps {
+    export interface EscalateComponentProps {
         variables ?: EscalateVariables;
         onReady ?: import('stencil-apollo/dist/types/components/apollo-mutation/types').OnMutationReadyFn<EscalateMutation, EscalateVariables>;
     }
-     export const EscalateComponent: FunctionalComponent<ComponentProps> = (props, children) => {
-        return (
-            <apollo-mutation
-            mutation={ EscalateDocument }
-            {...props}
-            >
-                {children}
-            </apollo-mutation>
-        );
-    }
+     export const EscalateComponent = (props: EscalateComponentProps) => <apollo-mutation mutation={ EscalateDocument } {...props} />;
diff --git a/dev-test/test-mongodb/types.ts b/dev-test/test-mongodb/types.ts
index a74ad9fc76e..9f4e2e2cbd8 100644
--- a/dev-test/test-mongodb/types.ts
+++ b/dev-test/test-mongodb/types.ts
@@ -236,35 +236,35 @@ import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from '
 
 
 
-export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
+export type Resolver<Result, Parent = {}, TContext = {}, Args = {}> = (
   parent: Parent,
   args: Args,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Promise<Result> | Result;
 
-export interface ISubscriptionResolverObject<Result, Parent, Context, Args> {
+export interface ISubscriptionResolverObject<Result, Parent, TContext, Args> {
   subscribe<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): AsyncIterator<R | Result> | Promise<AsyncIterator<R | Result>>;
   resolve?<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): R | Result | Promise<R | Result>;
 }
 
-export type SubscriptionResolver<Result, Parent = {}, Context = {}, Args = {}> =
-  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, Context, Args>)
-  | ISubscriptionResolverObject<Result, Parent, Context, Args>;
+export type SubscriptionResolver<Result, Parent = {}, TContext = {}, Args = {}> =
+  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, TContext, Args>)
+  | ISubscriptionResolverObject<Result, Parent, TContext, Args>;
 
-export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
+export type TypeResolveFn<Types, Parent = {}, TContext = {}> = (
   parent: Parent,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Maybe<Types>;
 
@@ -280,51 +280,51 @@ export type DirectiveResolverFn<TResult, TArgs = {}, TContext = {}> = (
 
 
 export namespace PostResolvers {
-  export interface Resolvers<Context = {}, TypeParent = Post> {
+  export interface Resolvers<TContext = {}, TypeParent = Post> {
     
-    id?: IdResolver<Maybe<string>, TypeParent, Context>;
+    id?: IdResolver<Maybe<string>, TypeParent, TContext>;
     
-    title?: TitleResolver<Maybe<string>, TypeParent, Context>;
+    title?: TitleResolver<Maybe<string>, TypeParent, TContext>;
     
-    content?: ContentResolver<Maybe<string>, TypeParent, Context>;
+    content?: ContentResolver<Maybe<string>, TypeParent, TContext>;
     
-    createdAt?: CreatedAtResolver<Maybe<Date>, TypeParent, Context>;
+    createdAt?: CreatedAtResolver<Maybe<Date>, TypeParent, TContext>;
     
-    author?: AuthorResolver<Maybe<User>, TypeParent, Context>;
+    author?: AuthorResolver<Maybe<User>, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = Maybe<string>, Parent = Post, Context = {}> = Resolver<R, Parent, Context>;
-  export type TitleResolver<R = Maybe<string>, Parent = Post, Context = {}> = Resolver<R, Parent, Context>;
-  export type ContentResolver<R = Maybe<string>, Parent = Post, Context = {}> = Resolver<R, Parent, Context>;
-  export type CreatedAtResolver<R = Maybe<Date>, Parent = Post, Context = {}> = Resolver<R, Parent, Context>;
-  export type AuthorResolver<R = Maybe<User>, Parent = Post, Context = {}> = Resolver<R, Parent, Context>;  
+  export type IdResolver<R = Maybe<string>, Parent = Post, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type TitleResolver<R = Maybe<string>, Parent = Post, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type ContentResolver<R = Maybe<string>, Parent = Post, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type CreatedAtResolver<R = Maybe<Date>, Parent = Post, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type AuthorResolver<R = Maybe<User>, Parent = Post, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 export namespace AdminUserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = AdminUser> {
+  export interface Resolvers<TContext = {}, TypeParent = AdminUser> {
     
-    id?: IdResolver<Maybe<string>, TypeParent, Context>;
+    id?: IdResolver<Maybe<string>, TypeParent, TContext>;
     
-    username?: UsernameResolver<Maybe<string>, TypeParent, Context>;
+    username?: UsernameResolver<Maybe<string>, TypeParent, TContext>;
     
-    role?: RoleResolver<Maybe<Role>, TypeParent, Context>;
+    role?: RoleResolver<Maybe<Role>, TypeParent, TContext>;
     
-    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, Context>;
+    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, TContext>;
     
-    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
     
-    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
     
-    posts?: PostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, Context>;
+    posts?: PostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = Maybe<string>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type UsernameResolver<R = Maybe<string>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type RoleResolver<R = Maybe<Role>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context, FollowerUsersArgs>;
+  export type IdResolver<R = Maybe<string>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UsernameResolver<R = Maybe<string>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type RoleResolver<R = Maybe<Role>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext, FollowerUsersArgs>;
   export interface FollowerUsersArgs {
     
     skip?: Maybe<number>;
@@ -333,7 +333,7 @@ export namespace AdminUserResolvers {
   }
 
 
-  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context, FollowingUsersArgs>;
+  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext, FollowingUsersArgs>;
   export interface FollowingUsersArgs {
     
     skip?: Maybe<number>;
@@ -342,7 +342,7 @@ export namespace AdminUserResolvers {
   }
 
 
-  export type PostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = AdminUser, Context = {}> = Resolver<R, Parent, Context, PostsArgs>;
+  export type PostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = AdminUser, TContext = {}> = Resolver<R, Parent, TContext, PostsArgs>;
   export interface PostsArgs {
     
     skip?: Maybe<number>;
@@ -350,32 +350,32 @@ export namespace AdminUserResolvers {
     limit?: Maybe<number>;
   }
 
-  
+
 }
 
 export namespace WriterUserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = WriterUser> {
+  export interface Resolvers<TContext = {}, TypeParent = WriterUser> {
     
-    id?: IdResolver<Maybe<string>, TypeParent, Context>;
+    id?: IdResolver<Maybe<string>, TypeParent, TContext>;
     
-    username?: UsernameResolver<Maybe<string>, TypeParent, Context>;
+    username?: UsernameResolver<Maybe<string>, TypeParent, TContext>;
     
-    role?: RoleResolver<Maybe<Role>, TypeParent, Context>;
+    role?: RoleResolver<Maybe<Role>, TypeParent, TContext>;
     
-    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, Context>;
+    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, TContext>;
     
-    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
     
-    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
     
-    posts?: PostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, Context>;
+    posts?: PostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = Maybe<string>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type UsernameResolver<R = Maybe<string>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type RoleResolver<R = Maybe<Role>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context, LikedPostsArgs>;
+  export type IdResolver<R = Maybe<string>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UsernameResolver<R = Maybe<string>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type RoleResolver<R = Maybe<Role>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext, LikedPostsArgs>;
   export interface LikedPostsArgs {
     
     skip?: Maybe<number>;
@@ -384,7 +384,7 @@ export namespace WriterUserResolvers {
   }
 
 
-  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context, FollowerUsersArgs>;
+  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext, FollowerUsersArgs>;
   export interface FollowerUsersArgs {
     
     skip?: Maybe<number>;
@@ -393,7 +393,7 @@ export namespace WriterUserResolvers {
   }
 
 
-  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context, FollowingUsersArgs>;
+  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext, FollowingUsersArgs>;
   export interface FollowingUsersArgs {
     
     skip?: Maybe<number>;
@@ -402,7 +402,7 @@ export namespace WriterUserResolvers {
   }
 
 
-  export type PostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = WriterUser, Context = {}> = Resolver<R, Parent, Context, PostsArgs>;
+  export type PostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = WriterUser, TContext = {}> = Resolver<R, Parent, TContext, PostsArgs>;
   export interface PostsArgs {
     
     skip?: Maybe<number>;
@@ -410,30 +410,30 @@ export namespace WriterUserResolvers {
     limit?: Maybe<number>;
   }
 
-  
+
 }
 
 export namespace ReaderUserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = ReaderUser> {
+  export interface Resolvers<TContext = {}, TypeParent = ReaderUser> {
     
-    id?: IdResolver<Maybe<string>, TypeParent, Context>;
+    id?: IdResolver<Maybe<string>, TypeParent, TContext>;
     
-    username?: UsernameResolver<Maybe<string>, TypeParent, Context>;
+    username?: UsernameResolver<Maybe<string>, TypeParent, TContext>;
     
-    role?: RoleResolver<Maybe<Role>, TypeParent, Context>;
+    role?: RoleResolver<Maybe<Role>, TypeParent, TContext>;
     
-    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, Context>;
+    likedPosts?: LikedPostsResolver<Maybe<(Maybe<Post>)[]>, TypeParent, TContext>;
     
-    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followerUsers?: FollowerUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
     
-    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, Context>;
+    followingUsers?: FollowingUsersResolver<Maybe<(Maybe<User>)[]>, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = Maybe<string>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type UsernameResolver<R = Maybe<string>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type RoleResolver<R = Maybe<Role>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context>;
-  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context, LikedPostsArgs>;
+  export type IdResolver<R = Maybe<string>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UsernameResolver<R = Maybe<string>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type RoleResolver<R = Maybe<Role>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type LikedPostsResolver<R = Maybe<(Maybe<Post>)[]>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext, LikedPostsArgs>;
   export interface LikedPostsArgs {
     
     skip?: Maybe<number>;
@@ -442,7 +442,7 @@ export namespace ReaderUserResolvers {
   }
 
 
-  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context, FollowerUsersArgs>;
+  export type FollowerUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext, FollowerUsersArgs>;
   export interface FollowerUsersArgs {
     
     skip?: Maybe<number>;
@@ -451,7 +451,7 @@ export namespace ReaderUserResolvers {
   }
 
 
-  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = ReaderUser, Context = {}> = Resolver<R, Parent, Context, FollowingUsersArgs>;
+  export type FollowingUsersResolver<R = Maybe<(Maybe<User>)[]>, Parent = ReaderUser, TContext = {}> = Resolver<R, Parent, TContext, FollowingUsersArgs>;
   export interface FollowingUsersArgs {
     
     skip?: Maybe<number>;
@@ -459,7 +459,7 @@ export namespace ReaderUserResolvers {
     limit?: Maybe<number>;
   }
 
-  
+
 }
 
 
@@ -467,7 +467,7 @@ export namespace UserResolvers {
   export interface Resolvers {
     __resolveType: ResolveType;
   }
-  export type ResolveType<R = 'AdminUser', Parent = AdminUser, Context = {}> = TypeResolveFn<R, Parent, Context>;
+  export type ResolveType<R = 'AdminUser', Parent = AdminUser, TContext = {}> = TypeResolveFn<R, Parent, TContext>;
   
 }
 
@@ -542,16 +542,16 @@ export interface DateScalarConfig extends GraphQLScalarTypeConfig<Date, any> {
   name: 'Date'
 }
 
-export interface IResolvers<Context = {}> {
-    Post?: PostResolvers.Resolvers<Context>;
-    AdminUser?: AdminUserResolvers.Resolvers<Context>;
-    WriterUser?: WriterUserResolvers.Resolvers<Context>;
-    ReaderUser?: ReaderUserResolvers.Resolvers<Context>;
-    User?: UserResolvers.Resolvers<Context>;
+export type IResolvers<TContext = {}> = {
+    Post?: PostResolvers.Resolvers<TContext>;
+    AdminUser?: AdminUserResolvers.Resolvers<TContext>;
+    WriterUser?: WriterUserResolvers.Resolvers<TContext>;
+    ReaderUser?: ReaderUserResolvers.Resolvers<TContext>;
+    User?: UserResolvers.Resolvers;
     Date?: GraphQLScalarType;
-}
+} & { [typeName: string] : never };
 
-export interface IDirectiveResolvers<Result> {
+export type IDirectiveResolvers<Result> = {
     union?: UnionDirectiveResolver<Result>;
     abstractEntity?: AbstractEntityDirectiveResolver<Result>;
     entity?: EntityDirectiveResolver<Result>;
@@ -563,4 +563,4 @@ export interface IDirectiveResolvers<Result> {
     skip?: SkipDirectiveResolver<Result>;
     include?: IncludeDirectiveResolver<Result>;
     deprecated?: DeprecatedDirectiveResolver<Result>;
-}
\ No newline at end of file
+} & { [directiveName: string] : never };
diff --git a/dev-test/test-schema/resolvers-root.ts b/dev-test/test-schema/resolvers-root.ts
index 3552f07258c..61edb77a40b 100644
--- a/dev-test/test-schema/resolvers-root.ts
+++ b/dev-test/test-schema/resolvers-root.ts
@@ -57,35 +57,35 @@ import { GraphQLResolveInfo } from 'graphql';
 
 
 
-export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
+export type Resolver<Result, Parent = {}, TContext = {}, Args = {}> = (
   parent: Parent,
   args: Args,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Promise<Result> | Result;
 
-export interface ISubscriptionResolverObject<Result, Parent, Context, Args> {
+export interface ISubscriptionResolverObject<Result, Parent, TContext, Args> {
   subscribe<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): AsyncIterator<R | Result> | Promise<AsyncIterator<R | Result>>;
   resolve?<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): R | Result | Promise<R | Result>;
 }
 
-export type SubscriptionResolver<Result, Parent = {}, Context = {}, Args = {}> =
-  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, Context, Args>)
-  | ISubscriptionResolverObject<Result, Parent, Context, Args>;
+export type SubscriptionResolver<Result, Parent = {}, TContext = {}, Args = {}> =
+  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, TContext, Args>)
+  | ISubscriptionResolverObject<Result, Parent, TContext, Args>;
 
-export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
+export type TypeResolveFn<Types, Parent = {}, TContext = {}> = (
   parent: Parent,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Maybe<Types>;
 
@@ -101,51 +101,51 @@ export type DirectiveResolverFn<TResult, TArgs = {}, TContext = {}> = (
 
 
 export namespace QueryRootResolvers {
-  export interface Resolvers<Context = {}, TypeParent = {}> {
+  export interface Resolvers<TContext = {}, TypeParent = {}> {
     
-    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, Context>;
+    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, TContext>;
     
-    userById?: UserByIdResolver<Maybe<User>, TypeParent, Context>;
+    userById?: UserByIdResolver<Maybe<User>, TypeParent, TContext>;
     /** Generates a new answer for the guessing game */
-    answer?: AnswerResolver<number[], TypeParent, Context>;
+    answer?: AnswerResolver<number[], TypeParent, TContext>;
   }
 
 
-  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, Context = {}> = Resolver<R, Parent, Context>;
-  export type UserByIdResolver<R = Maybe<User>, Parent = {}, Context = {}> = Resolver<R, Parent, Context, UserByIdArgs>;
+  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UserByIdResolver<R = Maybe<User>, Parent = {}, TContext = {}> = Resolver<R, Parent, TContext, UserByIdArgs>;
   export interface UserByIdArgs {
     
     id: number;
   }
 
 
-  export type AnswerResolver<R = number[], Parent = {}, Context = {}> = Resolver<R, Parent, Context>;  
+  export type AnswerResolver<R = number[], Parent = {}, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 export namespace UserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = User> {
+  export interface Resolvers<TContext = {}, TypeParent = User> {
     
-    id?: IdResolver<number, TypeParent, Context>;
+    id?: IdResolver<number, TypeParent, TContext>;
     
-    name?: NameResolver<string, TypeParent, Context>;
+    name?: NameResolver<string, TypeParent, TContext>;
     
-    email?: EmailResolver<string, TypeParent, Context>;
+    email?: EmailResolver<string, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = number, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type NameResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type EmailResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;  
+  export type IdResolver<R = number, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type NameResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type EmailResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 export namespace SubscriptionRootResolvers {
-  export interface Resolvers<Context = {}, TypeParent = {}> {
+  export interface Resolvers<TContext = {}, TypeParent = {}> {
     
-    newUser?: NewUserResolver<Maybe<User>, TypeParent, Context>;
+    newUser?: NewUserResolver<Maybe<User>, TypeParent, TContext>;
   }
 
 
-  export type NewUserResolver<R = Maybe<User>, Parent = {}, Context = {}> = SubscriptionResolver<R, Parent, Context>;  
+  export type NewUserResolver<R = Maybe<User>, Parent = {}, TContext = {}> = SubscriptionResolver<R, Parent, TContext>;
 }
 
 
@@ -173,14 +173,14 @@ export interface DeprecatedDirectiveArgs {
 
 
 
-export interface IResolvers<Context = {}> {
-    QueryRoot?: QueryRootResolvers.Resolvers<Context>;
-    User?: UserResolvers.Resolvers<Context>;
-    SubscriptionRoot?: SubscriptionRootResolvers.Resolvers<Context>;
-}
+export type IResolvers<TContext = {}> = {
+    QueryRoot?: QueryRootResolvers.Resolvers<TContext>;
+    User?: UserResolvers.Resolvers<TContext>;
+    SubscriptionRoot?: SubscriptionRootResolvers.Resolvers<TContext>;
+} & { [typeName: string] : never };
 
-export interface IDirectiveResolvers<Result> {
+export type IDirectiveResolvers<Result> = {
     skip?: SkipDirectiveResolver<Result>;
     include?: IncludeDirectiveResolver<Result>;
     deprecated?: DeprecatedDirectiveResolver<Result>;
-}
\ No newline at end of file
+} & { [directiveName: string] : never };
diff --git a/dev-test/test-schema/resolvers-types.ts b/dev-test/test-schema/resolvers-types.ts
index 2f60664894f..513f347a991 100644
--- a/dev-test/test-schema/resolvers-types.ts
+++ b/dev-test/test-schema/resolvers-types.ts
@@ -51,35 +51,35 @@ import { GraphQLResolveInfo } from 'graphql';
 
 
 
-export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
+export type Resolver<Result, Parent = {}, TContext = {}, Args = {}> = (
   parent: Parent,
   args: Args,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Promise<Result> | Result;
 
-export interface ISubscriptionResolverObject<Result, Parent, Context, Args> {
+export interface ISubscriptionResolverObject<Result, Parent, TContext, Args> {
   subscribe<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): AsyncIterator<R | Result> | Promise<AsyncIterator<R | Result>>;
   resolve?<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): R | Result | Promise<R | Result>;
 }
 
-export type SubscriptionResolver<Result, Parent = {}, Context = {}, Args = {}> =
-  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, Context, Args>)
-  | ISubscriptionResolverObject<Result, Parent, Context, Args>;
+export type SubscriptionResolver<Result, Parent = {}, TContext = {}, Args = {}> =
+  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, TContext, Args>)
+  | ISubscriptionResolverObject<Result, Parent, TContext, Args>;
 
-export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
+export type TypeResolveFn<Types, Parent = {}, TContext = {}> = (
   parent: Parent,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Maybe<Types>;
 
@@ -95,41 +95,41 @@ export type DirectiveResolverFn<TResult, TArgs = {}, TContext = {}> = (
 
 
 export namespace QueryResolvers {
-  export interface Resolvers<Context = {}, TypeParent = {}> {
+  export interface Resolvers<TContext = {}, TypeParent = {}> {
     
-    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, Context>;
+    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, TContext>;
     
-    userById?: UserByIdResolver<Maybe<User>, TypeParent, Context>;
+    userById?: UserByIdResolver<Maybe<User>, TypeParent, TContext>;
     
-    answer?: AnswerResolver<number[], TypeParent, Context>;
+    answer?: AnswerResolver<number[], TypeParent, TContext>;
   }
 
 
-  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, Context = {}> = Resolver<R, Parent, Context>;
-  export type UserByIdResolver<R = Maybe<User>, Parent = {}, Context = {}> = Resolver<R, Parent, Context, UserByIdArgs>;
+  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UserByIdResolver<R = Maybe<User>, Parent = {}, TContext = {}> = Resolver<R, Parent, TContext, UserByIdArgs>;
   export interface UserByIdArgs {
     
     id: number;
   }
 
 
-  export type AnswerResolver<R = number[], Parent = {}, Context = {}> = Resolver<R, Parent, Context>;  
+  export type AnswerResolver<R = number[], Parent = {}, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 export namespace UserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = User> {
+  export interface Resolvers<TContext = {}, TypeParent = User> {
     
-    id?: IdResolver<number, TypeParent, Context>;
+    id?: IdResolver<number, TypeParent, TContext>;
     
-    name?: NameResolver<string, TypeParent, Context>;
+    name?: NameResolver<string, TypeParent, TContext>;
     
-    email?: EmailResolver<string, TypeParent, Context>;
+    email?: EmailResolver<string, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = number, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type NameResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type EmailResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;  
+  export type IdResolver<R = number, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type NameResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type EmailResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 
@@ -157,13 +157,13 @@ export interface DeprecatedDirectiveArgs {
 
 
 
-export interface IResolvers<Context = {}> {
-    Query?: QueryResolvers.Resolvers<Context>;
-    User?: UserResolvers.Resolvers<Context>;
-}
+export type IResolvers<TContext = {}> = {
+    Query?: QueryResolvers.Resolvers<TContext>;
+    User?: UserResolvers.Resolvers<TContext>;
+} & { [typeName: string] : never };
 
-export interface IDirectiveResolvers<Result> {
+export type IDirectiveResolvers<Result> = {
     skip?: SkipDirectiveResolver<Result>;
     include?: IncludeDirectiveResolver<Result>;
     deprecated?: DeprecatedDirectiveResolver<Result>;
-}
\ No newline at end of file
+} & { [directiveName: string] : never };
diff --git a/dev-test/test-schema/typings.ts b/dev-test/test-schema/typings.ts
index d204797c0c4..444611508a0 100644
--- a/dev-test/test-schema/typings.ts
+++ b/dev-test/test-schema/typings.ts
@@ -49,35 +49,35 @@ import { GraphQLResolveInfo } from 'graphql';
 
 
 
-export type Resolver<Result, Parent = {}, Context = {}, Args = {}> = (
+export type Resolver<Result, Parent = {}, TContext = {}, Args = {}> = (
   parent: Parent,
   args: Args,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Promise<Result> | Result;
 
-export interface ISubscriptionResolverObject<Result, Parent, Context, Args> {
+export interface ISubscriptionResolverObject<Result, Parent, TContext, Args> {
   subscribe<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): AsyncIterator<R | Result> | Promise<AsyncIterator<R | Result>>;
   resolve?<R = Result, P = Parent>(
     parent: P,
     args: Args,
-    context: Context,
+    context: TContext,
     info: GraphQLResolveInfo
   ): R | Result | Promise<R | Result>;
 }
 
-export type SubscriptionResolver<Result, Parent = {}, Context = {}, Args = {}> =
-  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, Context, Args>)
-  | ISubscriptionResolverObject<Result, Parent, Context, Args>;
+export type SubscriptionResolver<Result, Parent = {}, TContext = {}, Args = {}> =
+  | ((...args: any[]) => ISubscriptionResolverObject<Result, Parent, TContext, Args>)
+  | ISubscriptionResolverObject<Result, Parent, TContext, Args>;
 
-export type TypeResolveFn<Types, Parent = {}, Context = {}> = (
+export type TypeResolveFn<Types, Parent = {}, TContext = {}> = (
   parent: Parent,
-  context: Context,
+  context: TContext,
   info: GraphQLResolveInfo
 ) => Maybe<Types>;
 
@@ -93,38 +93,38 @@ export type DirectiveResolverFn<TResult, TArgs = {}, TContext = {}> = (
 
 
 export namespace QueryResolvers {
-  export interface Resolvers<Context = {}, TypeParent = {}> {
+  export interface Resolvers<TContext = {}, TypeParent = {}> {
     
-    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, Context>;
+    allUsers?: AllUsersResolver<(Maybe<User>)[], TypeParent, TContext>;
     
-    userById?: UserByIdResolver<Maybe<User>, TypeParent, Context>;
+    userById?: UserByIdResolver<Maybe<User>, TypeParent, TContext>;
   }
 
 
-  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, Context = {}> = Resolver<R, Parent, Context>;
-  export type UserByIdResolver<R = Maybe<User>, Parent = {}, Context = {}> = Resolver<R, Parent, Context, UserByIdArgs>;
+  export type AllUsersResolver<R = (Maybe<User>)[], Parent = {}, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type UserByIdResolver<R = Maybe<User>, Parent = {}, TContext = {}> = Resolver<R, Parent, TContext, UserByIdArgs>;
   export interface UserByIdArgs {
     
     id: number;
   }
 
-  
+
 }
 
 export namespace UserResolvers {
-  export interface Resolvers<Context = {}, TypeParent = User> {
+  export interface Resolvers<TContext = {}, TypeParent = User> {
     
-    id?: IdResolver<number, TypeParent, Context>;
+    id?: IdResolver<number, TypeParent, TContext>;
     
-    name?: NameResolver<string, TypeParent, Context>;
+    name?: NameResolver<string, TypeParent, TContext>;
     
-    email?: EmailResolver<string, TypeParent, Context>;
+    email?: EmailResolver<string, TypeParent, TContext>;
   }
 
 
-  export type IdResolver<R = number, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type NameResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;
-  export type EmailResolver<R = string, Parent = User, Context = {}> = Resolver<R, Parent, Context>;  
+  export type IdResolver<R = number, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type NameResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
+  export type EmailResolver<R = string, Parent = User, TContext = {}> = Resolver<R, Parent, TContext>;
 }
 
 
@@ -152,13 +152,13 @@ export interface DeprecatedDirectiveArgs {
 
 
 
-export interface IResolvers<Context = {}> {
-    Query?: QueryResolvers.Resolvers<Context>;
-    User?: UserResolvers.Resolvers<Context>;
-}
+export type IResolvers<TContext = {}> = {
+    Query?: QueryResolvers.Resolvers<TContext>;
+    User?: UserResolvers.Resolvers<TContext>;
+} & { [typeName: string] : never };
 
-export interface IDirectiveResolvers<Result> {
+export type IDirectiveResolvers<Result> = {
     skip?: SkipDirectiveResolver<Result>;
     include?: IncludeDirectiveResolver<Result>;
     deprecated?: DeprecatedDirectiveResolver<Result>;
-}
\ No newline at end of file
+} & { [directiveName: string] : never };
diff --git a/packages/plugins/typescript-client/tests/typescript-client.spec.ts b/packages/plugins/typescript-client/tests/typescript-client.spec.ts
index 0659e27efd4..207cef0f8ec 100644
--- a/packages/plugins/typescript-client/tests/typescript-client.spec.ts
+++ b/packages/plugins/typescript-client/tests/typescript-client.spec.ts
@@ -1018,4 +1018,51 @@ describe('TypeScript Client', () => {
       }
     `);
   });
+
+  it('avoid duplicates - each type name should be unique', async () => {
+    const testSchema = makeExecutableSchema({
+      typeDefs: gql`
+        type DeleteMutation {
+          deleted: Boolean!
+        }
+
+        type UpdateMutation {
+          updated: Boolean!
+        }
+
+        union MessageMutationType = DeleteMutation | UpdateMutation
+
+        type Query {
+          dummy: String
+        }
+
+        type Mutation {
+          mutation(message: String!, type: String!): MessageMutationType!
+        }
+      `
+    });
+    const query = gql`
+      mutation SubmitMessage($message: String!) {
+        mutation(message: $message) {
+          ... on DeleteMutation {
+            deleted
+          }
+          ... on UpdateMutation {
+            updated
+          }
+        }
+      }
+    `;
+
+    const content = await plugin(
+      testSchema,
+      [{ filePath: '', content: query }],
+      {},
+      {
+        outputFile: 'graphql.ts'
+      }
+    );
+
+    expect(content.match(/type Mutation\b/g)).toHaveLength(1);
+  });
 });
diff --git a/packages/utils/plugins-helpers/src/flatten-types.ts b/packages/utils/plugins-helpers/src/flatten-types.ts
index 834db9a14e9..87e665dff1e 100644
--- a/packages/utils/plugins-helpers/src/flatten-types.ts
+++ b/packages/utils/plugins-helpers/src/flatten-types.ts
@@ -40,8 +40,10 @@ export interface FlattenModel {
   hasTypename: boolean;
 }
 
+const operationTypes = ['query', 'mutation', 'subscription'].map(name => pascalCase(name));
+
 export const handleNameDuplications = (name: string, existing: FlattenModel[]): string => {
-  if (existing.find(model => model.modelType === name)) {
+  if (operationTypes.includes(name) || existing.find(model => model.modelType === name)) {
     return handleNameDuplications('_' + name, existing);
   }