3 files changed, 10 insertions, 16 deletions
diff --git a/src/ts/types/articles.ts b/src/ts/types/articles.ts
index ea90207..64d2860 100644
--- a/src/ts/types/articles.ts
+++ b/src/ts/types/articles.ts
@@ -1,5 +1,5 @@
 import { ContentInfo, ContentParts, Dates } from './app';
-import { Comment, CommentsNode } from './comments';
+import { Comment } from './comments';
 import { Cover, RawCover } from './cover';
 import { SEO } from './seo';
 import { RawTopicPreview, TopicPreview, ThematicPreview } from './taxonomies';
@@ -85,7 +85,7 @@ export type RawArticlePreview = Pick<
 };
 
 export type PostBy = {
-  postBy: RawArticle;
+  post: RawArticle;
 };
 
 export type ArticleProps = {
diff --git a/src/ts/types/comments.ts b/src/ts/types/comments.ts
index 36bd98c..aa3fac3 100644
--- a/src/ts/types/comments.ts
+++ b/src/ts/types/comments.ts
@@ -2,17 +2,9 @@
 // Comments query
 //==============================================================================
 
-export type CommentsByPostId = {
-  postBy: {
-    comments: {
-      nodes: RawComment[];
-    };
-  };
-};
-
 export type CommentAuthor = {
-  gravatarUrl: string;
   name: string;
+  gravatarUrl: string;
   url: string;
 };
 
@@ -23,12 +15,10 @@ export type RawCommentAuthor = {
 export type Comment = {
   approved: '';
   author: CommentAuthor;
-  commentId: number;
+  databaseId: number;
   content: string;
   date: string;
-  id: string;
   parentDatabaseId: number;
-  parentId: string | null;
   replies: Comment[];
 };
 
@@ -40,6 +30,10 @@ export type CommentsNode = {
   nodes: RawComment[];
 };
 
+export type CommentsByPostId = {
+  comments: CommentsNode;
+};
+
 //==============================================================================
 // Comment mutations
 //==============================================================================
diff --git a/src/ts/types/taxonomies.ts b/src/ts/types/taxonomies.ts
index 8a0fcc7..17fc022 100644
--- a/src/ts/types/taxonomies.ts
+++ b/src/ts/types/taxonomies.ts
@@ -61,7 +61,7 @@ export type RawTopic = TopicPreview & {
 };
 
 export type TopicBy = {
-  topicBy: RawTopic;
+  topic: RawTopic;
 };
 
 export type AllTopicsSlug = {
@@ -99,7 +99,7 @@ export type RawThematic = TaxonomyPreview & {
 };
 
 export type ThematicBy = {
-  thematicBy: RawThematic;
+  thematic: RawThematic;
 };
 
 export type AllThematicsSlug = {