diff --git a/src/modules/device/queries/query.ts b/src/modules/device/queries/query.ts
index 55570cd..7343cdb 100644
--- a/src/modules/device/queries/query.ts
+++ b/src/modules/device/queries/query.ts
@@ -2,13 +2,13 @@ import { omit } from 'lodash-es'
 import { httpConfig } from '~/config'
 
 interface DeviceStatus {
-  floor: string
-  unit: string
-  device: string
-  room: string
-  devType: string
+  floorName: string
+  unitNumber: string
+  deviceName: string
+  roomName: string
+  deviceType: string
   code: string
-  tower: string
+  towerNumber: string
   payload: string
   topics?: unknown
   createAt?: unknown
diff --git a/src/modules/device/queries/service.ts b/src/modules/device/queries/service.ts
index a0b7914..253ed7c 100644
--- a/src/modules/device/queries/service.ts
+++ b/src/modules/device/queries/service.ts
@@ -6,13 +6,13 @@ export default abstract class QueryService {
     status: 'success'
     message: 'command accepted'
     data: {
-      floor: string
-      unit: string
-      device: string
-      room: string
-      devType: string
+      floorName: string
+      unitNumber: string
+      deviceName: string
+      roomName: string
+      deviceType: string
       code: string
-      tower: string
+      towerNumber: string
       payload: string
     }
   } | null> {
@@ -25,13 +25,13 @@ export default abstract class QueryService {
         status: 'success',
         message: 'command accepted',
         data: {
-          floor: 'L2',
-          unit: '01',
-          device: 'BL',
-          room: 'LV',
-          devType: 'S',
+          floorName: 'L2',
+          unitNumber: '01',
+          deviceName: 'BL',
+          roomName: 'LV',
+          deviceType: 'S',
           code: 'S',
-          tower: 'T1',
+          towerNumber: 'T1',
           payload: 'Open',
         },
       }
@@ -42,13 +42,13 @@ export default abstract class QueryService {
         status: 'success',
         message: 'command accepted',
         data: {
-          floor: 'L2',
-          unit: '01',
-          device: 'L',
-          room: 'LV',
-          devType: 'S',
+          floorName: 'L2',
+          unitNumber: '01',
+          deviceName: 'L',
+          roomName: 'LV',
+          deviceType: 'S',
           code: 'C',
-          tower: 'T1',
+          towerNumber: 'T1',
           payload: 'On',
         },
       }
diff --git a/src/modules/device/schema.ts b/src/modules/device/schema.ts
index e03b00b..a678377 100644
--- a/src/modules/device/schema.ts
+++ b/src/modules/device/schema.ts
@@ -70,13 +70,13 @@ export const deviceQueryResponseSchema = {
     status: z.literal('success'),
     message: z.literal('command accepted'),
     data: z.object({
-      floor: z.string(),
-      unit: z.string(),
-      device: z.string(),
-      room: z.string(),
-      devType: z.string(),
+      floorName: z.string(),
+      unitNumber: z.string(),
+      deviceName: z.string(),
+      roomName: z.string(),
+      deviceType: z.string(),
       code: z.string(),
-      tower: z.string(),
+      towerNumber: z.string(),
       payload: z.string(),
     }),
   }),