diff --git a/server/routers/contentstack/hotelPage/output.ts b/server/routers/contentstack/hotelPage/output.ts
index 7bf0ff474..bbe4ceb8f 100644
--- a/server/routers/contentstack/hotelPage/output.ts
+++ b/server/routers/contentstack/hotelPage/output.ts
@@ -6,7 +6,7 @@ import {
   activitiesCardRefSchema,
   activitiesCardSchema,
 } from "../schemas/blocks/activitiesCard"
-import { accordionRefsSchema,accordionSchema } from "../schemas/blocks/faq"
+import { hotelFaqRefsSchema, hotelFaqSchema } from "../schemas/blocks/hotelFaq"
 import { systemSchema } from "../schemas/system"
 
 import { HotelPageEnum } from "@/types/enums/hotelPage"
@@ -24,7 +24,7 @@ export const contentBlock = z.discriminatedUnion("__typename", [
 export const hotelPageSchema = z.object({
   hotel_page: z.object({
     content: discriminatedUnionArray(contentBlock.options).nullable(),
-    faq: accordionSchema,
+    faq: hotelFaqSchema,
     hotel_page_id: z.string(),
     title: z.string(),
     url: z.string(),
@@ -51,7 +51,7 @@ const hotelPageBlockRefsItem = z.discriminatedUnion("__typename", [
 export const hotelPageRefsSchema = z.object({
   hotel_page: z.object({
     content: discriminatedUnionArray(hotelPageBlockRefsItem.options).nullable(),
-    faq: accordionRefsSchema.nullable(),
+    faq: hotelFaqRefsSchema.nullable(),
     system: systemSchema,
   }),
 })
diff --git a/server/routers/contentstack/schemas/blocks/accordion.ts b/server/routers/contentstack/schemas/blocks/accordion.ts
index 64c646c4d..d96c2b7f7 100644
--- a/server/routers/contentstack/schemas/blocks/accordion.ts
+++ b/server/routers/contentstack/schemas/blocks/accordion.ts
@@ -4,7 +4,7 @@ import * as pageLinks from "@/server/routers/contentstack/schemas/pageLinks"
 
 import { BlocksEnums } from "@/types/enums/blocks"
 
-export const faqSchema = z.array(
+export const accordionItemsSchema = z.array(
   z.object({
     question: z.string(),
     answer: z.object({
@@ -33,7 +33,7 @@ export const faqSchema = z.array(
   })
 )
 
-export type FAQtype = z.infer<typeof accordionSchema> // MOVE
+export type Accordion = z.infer<typeof accordionSchema> // MOVE
 
 enum AccordionEnum {
   ContentPageBlocksAccordionBlockFaqGlobalFaq = "ContentPageBlocksAccordionBlockFaqGlobalFaq",
@@ -60,7 +60,7 @@ export const accordionSchema = z.object({
                 edges: z.array(
                   z.object({
                     node: z.object({
-                      questions: faqSchema,
+                      questions: accordionItemsSchema,
                     }),
                   })
                 ),
@@ -69,7 +69,7 @@ export const accordionSchema = z.object({
             .optional(),
           specific_faq: z
             .object({
-              questions: faqSchema,
+              questions: accordionItemsSchema,
             })
             .optional(),
         })
diff --git a/server/routers/contentstack/schemas/blocks/faq.ts b/server/routers/contentstack/schemas/blocks/hotelFaq.ts
similarity index 83%
rename from server/routers/contentstack/schemas/blocks/faq.ts
rename to server/routers/contentstack/schemas/blocks/hotelFaq.ts
index 1a060dc5a..3130b4f37 100644
--- a/server/routers/contentstack/schemas/blocks/faq.ts
+++ b/server/routers/contentstack/schemas/blocks/hotelFaq.ts
@@ -1,26 +1,27 @@
 import { z } from "zod"
 
 import {
-  faqSchema,
+  accordionItemsSchema,
   globalFaqConnectionRefs,
   specificFaqConnectionRefs,
 } from "./accordion"
 
+import { BlocksEnums } from "@/types/enums/blocks"
 import { HotelPageEnum } from "@/types/enums/hotelPage"
 
-export const accordionSchema = z
+export const hotelFaqSchema = z
   .object({
-    __typename: z
-      .literal(HotelPageEnum.ContentStack.blocks.Faq)
+    typename: z
+      .literal(BlocksEnums.block.Accordion)
       .optional()
-      .default(HotelPageEnum.ContentStack.blocks.Faq),
+      .default(BlocksEnums.block.Accordion),
     title: z.string().optional().default(""),
     global_faqConnection: z
       .object({
         edges: z.array(
           z.object({
             node: z.object({
-              questions: faqSchema,
+              questions: accordionItemsSchema,
             }),
           })
         ),
@@ -28,7 +29,7 @@ export const accordionSchema = z
       .optional(),
     specific_faq: z
       .object({
-        questions: faqSchema,
+        questions: accordionItemsSchema,
       })
       .optional(),
   })
@@ -43,7 +44,7 @@ export const accordionSchema = z
     return { ...data, faq: array.flat(2) }
   })
 
-export const accordionRefsSchema = z
+export const hotelFaqRefsSchema = z
   .object({
     __typename: z
       .literal(HotelPageEnum.ContentStack.blocks.Faq)
diff --git a/types/components/hotelPage/accordion.ts b/types/components/hotelPage/accordion.ts
index 3c84bde7d..69325ae40 100644
--- a/types/components/hotelPage/accordion.ts
+++ b/types/components/hotelPage/accordion.ts
@@ -1,6 +1,6 @@
-import type { FAQtype } from "@/server/routers/contentstack/schemas/blocks/accordion"
+import type { Accordion } from "@/server/routers/contentstack/schemas/blocks/accordion"
 
 export type AccordionProps = {
-  accordion: FAQtype["accordion"]["faq"]
+  accordion: Accordion["accordion"]["faq"]
   title?: string
 }