diff --git a/pms_api_rest/datamodels/pms_amenity.py b/pms_api_rest/datamodels/pms_amenity.py
index f52cfceba..b36ccdae9 100644
--- a/pms_api_rest/datamodels/pms_amenity.py
+++ b/pms_api_rest/datamodels/pms_amenity.py
@@ -15,3 +15,4 @@ class PmsAmenityInfo(Datamodel):
     name = fields.String(required=True, allow_none=False)
     defaultCode = fields.String(required=False, allow_none=True)
     amenityTypeId = fields.Integer(required=False, allow_none=True)
+    addInRoomName = fields.Boolean(required=False, allow_none=True)
diff --git a/pms_api_rest/services/pms_amenity_service.py b/pms_api_rest/services/pms_amenity_service.py
index 486c249d7..ac6e4a3fd 100644
--- a/pms_api_rest/services/pms_amenity_service.py
+++ b/pms_api_rest/services/pms_amenity_service.py
@@ -49,6 +49,7 @@ class PmsAmenityService(Component):
                     id=amenity.id,
                     name=amenity.name,
                     amenityTypeId=amenity.pms_amenity_type_id.id,
+                    addInRoomName=amenity.is_add_code_room_name,
                 )
             )
         return result_amenities
diff --git a/pms_api_rest/services/pms_room_service.py b/pms_api_rest/services/pms_room_service.py
index 702c75366..a96855b04 100644
--- a/pms_api_rest/services/pms_room_service.py
+++ b/pms_api_rest/services/pms_room_service.py
@@ -80,10 +80,10 @@ class PmsRoomService(Component):
             # TODO: avoid, change short_name,
             # set code amenities like a tag in room calendar name?
             short_name = room.short_name
-            if room.room_amenity_ids:
-                for amenity in room.room_amenity_ids:
-                    if amenity.is_add_code_room_name:
-                        short_name += "%s" % amenity.default_code
+            # if room.room_amenity_ids:
+            #     for amenity in room.room_amenity_ids:
+            #         if amenity.is_add_code_room_name:
+            #             short_name += "%s" % amenity.default_code
             result_rooms.append(
                 PmsRoomInfo(
                     id=room.id,