diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py
index 2eef7b194..a7e325a6d 100644
--- a/pms/models/pms_checkin_partner.py
+++ b/pms/models/pms_checkin_partner.py
@@ -98,7 +98,7 @@ class PmsCheckinPartner(models.Model):
     state = fields.Selection(
         [
             ("draft", "Pending Entry"),
-            ("booking", "On Board"),
+            ("onboard", "On Board"),
             ("done", "Out"),
             ("cancelled", "Cancelled"),
         ],
@@ -160,19 +160,19 @@ class PmsCheckinPartner(models.Model):
                 raise models.ValidationError(_("It is not yet checkin day!"))
             hour = record._get_arrival_hour()
             vals = {
-                "state": "booking",
+                "state": "onboard",
                 "arrival_hour": hour,
             }
             record.update(vals)
             if record.reservation_id.state == "confirm":
-                record.reservation_id.state = "booking"
+                record.reservation_id.state = "onboard"
         return {
             "type": "ir.actions.do_nothing",
         }
 
     def action_done(self):
         for record in self:
-            if record.state == "booking":
+            if record.state == "onboard":
                 hour = record._get_departure_hour()
                 vals = {
                     "state": "done",
diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py
index 0d2951f54..21d7478dc 100644
--- a/pms/models/pms_folio.py
+++ b/pms/models/pms_folio.py
@@ -544,7 +544,7 @@ class PmsFolio(models.Model):
     def action_done(self):
         reservation_ids = self.mapped("reservation_ids")
         for line in reservation_ids:
-            if line.state == "booking":
+            if line.state == "onboard":
                 line.action_reservation_checkout()
 
     def action_cancel(self):
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index aed6de165..bd329d6e0 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -221,7 +221,7 @@ class PmsReservation(models.Model):
         [
             ("draft", "Pre-reservation"),
             ("confirm", "Pending Entry"),
-            ("booking", "On Board"),
+            ("onboard", "On Board"),
             ("done", "Out"),
             ("cancelled", "Cancelled"),
         ],
@@ -833,7 +833,7 @@ class PmsReservation(models.Model):
         )
         for res in reservations:
             res.action_reservation_checkout()
-        res_without_checkin = reservations.filtered(lambda r: r.state != "booking")
+        res_without_checkin = reservations.filtered(lambda r: r.state != "onboard")
         for res in res_without_checkin:
             msg = _("No checkin was made for this reservation")
             res.message_post(subject=_("No Checkins!"), subtype="mt_comment", body=msg)
@@ -873,7 +873,7 @@ class PmsReservation(models.Model):
         for record in self:
             vals = {}
             if record.checkin_partner_ids:
-                vals.update({"state": "booking"})
+                vals.update({"state": "onboard"})
             else:
                 vals.update({"state": "confirm"})
             record.write(vals)
@@ -990,7 +990,7 @@ class PmsReservation(models.Model):
             record.state = "done"
             if record.checkin_partner_ids:
                 record.checkin_partner_ids.filtered(
-                    lambda check: check.state == "booking"
+                    lambda check: check.state == "onboard"
                 ).action_done()
         return True
 
diff --git a/pms/views/pms_checkin_partner_views.xml b/pms/views/pms_checkin_partner_views.xml
index 0adf2d823..695d19df9 100644
--- a/pms/views/pms_checkin_partner_views.xml
+++ b/pms/views/pms_checkin_partner_views.xml
@@ -51,7 +51,7 @@
                 decoration-danger="state == 'draft'"
                 decoration-info="state == 'done'"
                 decoration-muted="state == 'cancelled'"
-                decoration-success="state == 'booking'"
+                decoration-success="state == 'onboard'"
             >
                 <button
                     type="object"
@@ -82,7 +82,7 @@
                 create="false"
                 decoration-danger="state == 'draft'"
                 decoration-muted="state == 'cancelled' or state =='done'"
-                decoration-success="state == 'booking'"
+                decoration-success="state == 'onboard'"
             >
                 <button
                     type="object"
@@ -117,7 +117,7 @@
                 <filter
                     string="On Board"
                     name="on_board"
-                    domain="[('state','=','booking')]"
+                    domain="[('state','=','onboard')]"
                     help="Current Booking"
                 />
                 <filter
@@ -144,7 +144,7 @@
                     string="On Board Tomorrow"
                     name="next_res_2week"
                     domain="[('enter_date', '&lt;', (context_today()+datetime.timedelta(days=14)).strftime('%Y-%m-%d')),
-                        ('state', 'in', ['confirm','booking'])]"
+                        ('state', 'in', ['confirm','onboard'])]"
                     help="Show all checkins for Tomorrow"
                 />
                 <group expand="0" string="Group By">
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index 6a6f1e3ec..ed426ce8a 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -27,12 +27,12 @@
                         name="action_cancel"
                         string="Cancel Reservation"
                         type="object"
-                        attrs="{'invisible':['|',('folio_id', '=', False),('state','not in',('confirm','booking'))]}"
+                        attrs="{'invisible':['|',('folio_id', '=', False),('state','not in',('confirm','onboard'))]}"
                     />
                     <button
                         name="action_reservation_checkout"
                         string="Done"
-                        states="booking"
+                        states="onboard"
                         type="object"
                     />
                     <button
@@ -45,7 +45,7 @@
                     <field
                         name="state"
                         widget="statusbar"
-                        statusbar_visible="draft,confirm,booking,done"
+                        statusbar_visible="draft,confirm,onboard,done"
                     />
                 </header>
                 <div
@@ -690,7 +690,7 @@
                     name="action_checks"
                     context="{'partner_id': partner_id,'enter_date': checkin,
                         'exit_date': checkout,'reservation_id': id, 'hidden_checkin_partner': True, 'edit_checkin_partner': True }"
-                    attrs="{'invisible':['|',('state','not in',('confirm','booking')),('checkin_partner_pending_count','=', 0)]}"
+                    attrs="{'invisible':['|',('state','not in',('confirm','onboard')),('checkin_partner_pending_count','=', 0)]}"
                 />
                 <field name="allowed_room_ids" invisible="1" />
                 <field name="room_id" options="{'no_create': True,'no_open': True}" />
@@ -805,7 +805,7 @@
                 <filter
                     string="On Board"
                     name="on_board"
-                    domain="[('state','in',['booking'])]"
+                    domain="[('state','in',['onboard'])]"
                     help="Current Booking"
                 />
                 <filter