diff --git a/admin/themes/default/template/controllers/normal_products/features.tpl b/admin/themes/default/template/controllers/normal_products/features.tpl
index 7c3cf710d..dc02a8aa8 100644
--- a/admin/themes/default/template/controllers/normal_products/features.tpl
+++ b/admin/themes/default/template/controllers/normal_products/features.tpl
@@ -50,7 +50,7 @@
 				<td>{$available_feature.name}</td>
 				<td>
 					<input type="hidden" id="feature_{$available_feature.id_feature}_value" name="feature_{$available_feature.id_feature}_value" value="{$value.id_feature_value}">
-					<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Stay image" />
+					<img class="img img-responsive" width="15px" src="{$base_url}img/rf/{$value.value}" title="Room image" />
 				</td>
 				{/foreach}
 				<!--<td>
diff --git a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
index dff4ef810..441d0b84b 100644
--- a/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
+++ b/admin/themes/default/template/controllers/orders/_current_cart_details_data.tpl
@@ -57,7 +57,7 @@
 								{/if}
 
 								{hook h='displayRoomNumAfter' data=$data type='adminOrder'}</td>
-								<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Stay image" /></td>
+								<td><img src="{$data.image_link|escape:'html':'UTF-8'}" title="Room image" /></td>
 								<td>
 									<p>{$data.room_type|escape:'html':'UTF-8'}</p>
 								</td>
diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl
index 7c7ea9a86..dd5eb9f22 100644
--- a/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_tab_content.tpl
@@ -156,6 +156,6 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button type="button" id="submitRoomChange" class="btn btn-primary"><i class="icon icon-bed"></i> &nbsp;{l s="Update Stays"}</button>
+        <button type="button" id="submitRoomChange" class="btn btn-primary"><i class="icon icon-bed"></i> &nbsp;{l s="Update Rooms"}</button>
     </div>
 </div>
diff --git a/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl b/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
index 4d5a25cb8..029f31656 100644
--- a/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
@@ -89,8 +89,8 @@
                     </div>
                     <div class="row">
                         <div class="alert alert-warning col-sm-12 realloc_roomtype_change_message" style="display:none">
-                            <p>{l s="If room type is changed while stay reallocation then all extra services will be assigned to the selected stay of new room type."}</p>
-                            <p>{l s="If you want to change extra services, you can update by editing the stay after reallocation."}</p>
+                            <p>{l s="If room type is changed while room reallocation then all extra services will be assigned to the selected room of new room type."}</p>
+                            <p>{l s="If you want to change extra services, you can update by editing the room after reallocation."}</p>
                         </div>
                     </div>
                     <p class="error_text" id="realloc_sel_rm_err_p"></p>
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index 07bf182ba..4d88277f5 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -382,7 +382,7 @@
                     </div>
                 </div>
 				<div class="from-group table-responsive-row clearfix" style="display:none;">
-                    <div class="stays-disable-dates-title">{l s='Disable Dates'}</div>
+                    <div class="rooms-disable-dates-title">{l s='Disable Dates'}</div>
                     <table class="table rooms-disable-dates">
                         <thead>
                             <tr class="nodrag nodrop">
@@ -496,7 +496,7 @@
                     </div>
                 </div>
 				<div class="from-group table-responsive-row clearfix" style="display:none;">
-                    <div class="stays-disable-dates-title">{l s='Disable Dates'}</div>
+                    <div class="rooms-disable-dates-title">{l s='Disable Dates'}</div>
                     <table class="table rooms-disable-dates">
                         <thead>
                             <tr class="nodrag nodrop">
diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php
index 5c6f73070..4bcfadfe9 100644
--- a/controllers/admin/AdminOrderPreferencesController.php
+++ b/controllers/admin/AdminOrderPreferencesController.php
@@ -96,7 +96,7 @@ class AdminOrderPreferencesControllerCore extends AdminController
                     ),
                     'PS_MIN_BOOKING_OFFSET' => array(
                         'title' => $this->l('Minimum booking offset'),
-                        'hint' => $this->l('The minimum booking offset is the minimum number of days before the check-in date that a guest must book a stay. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book stays for dates from and after 3 days, i.e, 5th of March.'),
+                        'hint' => $this->l('The minimum booking offset is the minimum number of days before the check-in date that a guest must book a room. For example, if you set this value to 3 and someone is booking on 2nd of March he can only book rooms for dates from and after 3 days, i.e, 5th of March.'),
                         'desc' => $this->l('Set to 0 to disable this feature.'),
                         'type' => 'text',
                         'class' => 'fixed-width-xl',
diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php
index cf87d2177..9b1005cb9 100644
--- a/controllers/admin/AdminPPreferencesController.php
+++ b/controllers/admin/AdminPPreferencesController.php
@@ -175,11 +175,11 @@ class AdminPPreferencesControllerCore extends AdminController
                             array('id' => HotelBookingDetail::SEARCH_ALL_ROOM_TYPE_ALGO, 'name' => $this->l('Show all available room types'))
                         ),
                         'identifier' => 'id',
-                        'desc' => $this->l('This option is only for fully available rooms. For partially available room, always all possible rooms will be displayed.'),
+                        'desc' => $this->l('This option is only for fully available rooms. For partially available rooms, always all possible rooms will be displayed.'),
                     ),
                     'PS_BACKOFFICE_ROOM_BOOKING_TYPE' => array(
                         'title' => $this->l('In back-office, add rooms to cart with'),
-                        'hint' => $this->l('In room occupancy, while adding room in cart customer has to select per room occupancy and in room quantity customer only has to select number of rooms.'),
+                        'hint' => $this->l('In Room occupancy, while adding room in cart customer has to select per room occupancy and in rooms quantity customer only has to select number of rooms.'),
                         'cast' => 'intval',
                         'type' => 'select',
                         'list' => array(
diff --git a/mails/en/bookings_refund_request_detail_admin.tpl b/mails/en/bookings_refund_request_detail_admin.tpl
index 22975a761..67a13baea 100644
--- a/mails/en/bookings_refund_request_detail_admin.tpl
+++ b/mails/en/bookings_refund_request_detail_admin.tpl
@@ -5,7 +5,7 @@
                 <th colspan="9" class="table-caption">{l s='Rooms Bookings Detail'}</th>
             </tr>
             <tr>
-                <th>{l s="Stay Num"}</th>
+                <th>{l s="Room Num"}</th>
                 <th>{l s="Room Type"}</th>
                 <th>{l s="Property Name"}</th>
                 <th>{l s="Duration"}</th>
diff --git a/mails/en/bookings_refund_request_detail_admin_text.tpl b/mails/en/bookings_refund_request_detail_admin_text.tpl
index aeee78e27..236cfacad 100644
--- a/mails/en/bookings_refund_request_detail_admin_text.tpl
+++ b/mails/en/bookings_refund_request_detail_admin_text.tpl
@@ -1,6 +1,6 @@
 {if isset($list) && $list}
 
-{l s="Stay Num"}
+{l s="Room Num"}
 
 {l s="Room Type"}
 
diff --git a/mails/en/bookings_refund_request_detail_customer.tpl b/mails/en/bookings_refund_request_detail_customer.tpl
index 3bdbb374a..9b5e067c9 100644
--- a/mails/en/bookings_refund_request_detail_customer.tpl
+++ b/mails/en/bookings_refund_request_detail_customer.tpl
@@ -7,7 +7,7 @@
             <tr>
                 <th>{l s="Room Type"}</th>
                 <th>{l s="Property Name"}</th>
-                <th>{l s="Stays Qty"}</th>
+                <th>{l s="Rooms Qty"}</th>
                 <th>{l s="Duration"}</th>
             </tr>
         </thead>
diff --git a/mails/en/bookings_refund_request_detail_customer_text.tpl b/mails/en/bookings_refund_request_detail_customer_text.tpl
index 79e780802..6cc0ee118 100644
--- a/mails/en/bookings_refund_request_detail_customer_text.tpl
+++ b/mails/en/bookings_refund_request_detail_customer_text.tpl
@@ -7,7 +7,7 @@
 
 {l s="Property Name"}
 
-{l s="Stays Qty"}
+{l s="Rooms Qty"}
 
 {l s="Duration"}
 
diff --git a/mails/en/hotel_booking_cart_data.tpl b/mails/en/hotel_booking_cart_data.tpl
index 1d747e204..e15cc0e07 100644
--- a/mails/en/hotel_booking_cart_data.tpl
+++ b/mails/en/hotel_booking_cart_data.tpl
@@ -5,11 +5,11 @@
                 <th colspan="9" class="table-caption">{l s='Rooms Booking Detail'}</th>
             </tr>
             <tr>
-                <th>{l s="Stay Image"}</th>
-                <th>{l s="Stay Description"}</th>
-                <th>{l s="Stay Capcity"}</th>
+                <th>{l s="Room Image"}</th>
+                <th>{l s="Room Description"}</th>
+                <th>{l s="Room Capacity"}</th>
                 <th>{l s="Unit Price"}</th>
-                <th>{l s="Stays Qty"}</th>
+                <th>{l s="Rooms Qty"}</th>
                 <th>{l s="Check-in Date"}</th>
                 <th>{l s="Check-out Date"}</th>
                 <th>{l s="Total"}</th>
diff --git a/mails/en/order_canceled.txt b/mails/en/order_canceled.txt
index 2cb8c69a7..ac4074023 100644
--- a/mails/en/order_canceled.txt
+++ b/mails/en/order_canceled.txt
@@ -9,7 +9,7 @@ been canceled.
 Here are your order details:
 Order reference: {order_name}
 Order total: {total_paid}
-Total Stays: {num_rooms}
+Total Rooms: {num_rooms}
 
 Hotel details:
 Hotel Name: {hotel_hotel_name}
diff --git a/mails/en/order_conf_total_info.tpl b/mails/en/order_conf_total_info.tpl
index d17cc8c3c..996bc3300 100644
--- a/mails/en/order_conf_total_info.tpl
+++ b/mails/en/order_conf_total_info.tpl
@@ -2,7 +2,7 @@
     {if isset($list['has_room_bookings']) && $list['has_room_bookings']}
         <tr>
             <td>
-                <strong>{l s="Total Stays Cost"}</strong>
+                <strong>{l s="Total Rooms Cost"}</strong>
             </td>
             <td>
                 {$list['room_price_tax_excl']}
@@ -41,7 +41,7 @@
     {/if}
     <tr>
         <td>
-            <strong>{l s="Stay and Service Tax"}</strong>
+            <strong>{l s="Room and Service Tax"}</strong>
         </td>
         <td>
             {$list['total_order_tax']}
diff --git a/mails/en/order_conf_total_info_text.tpl b/mails/en/order_conf_total_info_text.tpl
index 1ed81a47c..17ecd4848 100644
--- a/mails/en/order_conf_total_info_text.tpl
+++ b/mails/en/order_conf_total_info_text.tpl
@@ -1,5 +1,5 @@
 {if isset($list['has_room_bookings']) && $list['has_room_bookings']}
-{l s="Total Stays Cost"}  {$list['room_price_tax_excl']}
+{l s="Total Rooms Cost"}  {$list['room_price_tax_excl']}
 {/if}
 
 {if isset($list['has_standalone_products']) && $list['has_standalone_products']}
@@ -14,7 +14,7 @@
 {l s="Total Convenience Fees"}  {$list['total_convenience_fee_te']}
 {/if}
 
-{l s="Stay and Service Tax"}  {$list['total_order_tax']}
+{l s="Room and Service Tax"}  {$list['total_order_tax']}
 
 {if isset($list['has_tourism_tax']) && $list['has_tourism_tax']}
 {l s="Total Tourism Tax"}  {$list['total_tourism_tax']}
diff --git a/mails/en/order_refund_completed_admin.txt b/mails/en/order_refund_completed_admin.txt
index 0962d1344..5ab3942c1 100755
--- a/mails/en/order_refund_completed_admin.txt
+++ b/mails/en/order_refund_completed_admin.txt
@@ -12,7 +12,7 @@ Transaction Id: {id_transaction}
 
 Booking details
 
-Stay Num
+Room Num
 Room Type
 Hotel
 Duration
diff --git a/mails/en/order_refund_completed_customer.txt b/mails/en/order_refund_completed_customer.txt
index ae0f5ecd3..c063d7c0e 100755
--- a/mails/en/order_refund_completed_customer.txt
+++ b/mails/en/order_refund_completed_customer.txt
@@ -14,7 +14,7 @@ Booking details
 
 Room Type
 Hotel
-Num. Stays
+Num. Rooms
 Duration
 {refundBookingHtml}
 
diff --git a/mails/en/order_refund_denied_admin.txt b/mails/en/order_refund_denied_admin.txt
index 402c08def..722b43415 100755
--- a/mails/en/order_refund_denied_admin.txt
+++ b/mails/en/order_refund_denied_admin.txt
@@ -10,7 +10,7 @@ Refund Status: {status_name}
 
 Booking details
 
-Stay Num
+Room Num
 Room Type
 Hotel
 Duration
diff --git a/mails/en/order_refund_denied_customer.txt b/mails/en/order_refund_denied_customer.txt
index a5d520607..cbd4410fe 100755
--- a/mails/en/order_refund_denied_customer.txt
+++ b/mails/en/order_refund_denied_customer.txt
@@ -13,7 +13,7 @@ Booking details
 
 Room Type
 Hotel
-Num. Stays
+Num. Rooms
 Duration
 
 {refundBookingHtml}
diff --git a/mails/en/order_refund_pending_admin.txt b/mails/en/order_refund_pending_admin.txt
index d3cfb2814..f520f617c 100755
--- a/mails/en/order_refund_pending_admin.txt
+++ b/mails/en/order_refund_pending_admin.txt
@@ -11,7 +11,7 @@ Cancelation Reason: {cancelation_reason}
 
 Requested Booking Cancellations
 
-Stay Num
+Room Num
 Room Type
 Hotel
 Duration
diff --git a/mails/en/order_refund_pending_customer.txt b/mails/en/order_refund_pending_customer.txt
index c50c62b34..012c6e64e 100755
--- a/mails/en/order_refund_pending_customer.txt
+++ b/mails/en/order_refund_pending_customer.txt
@@ -12,7 +12,7 @@ Booking details
 
 Room Type
 Hotel
-Num. Stays
+Num. Rooms
 Duration
 
 {refundBookingHtml}
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 1c0c78a7c..232000e56 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -263,7 +263,7 @@
 							{block name='blockcart_layer_cart_room_total_price'}
 								<div class="layer_cart_row">
 									<strong class="dark">
-										{l s='Total Room Cost in cart' mod='blockcart'}
+										{l s='Total Rooms Cost in cart' mod='blockcart'}
 										{if $display_tax_label}
 											{if $priceDisplay == 1}
 												{l s='(tax excl.)' mod='blockcart'}
diff --git a/modules/dashinsights/views/templates/hook/dashboard-zone-two.tpl b/modules/dashinsights/views/templates/hook/dashboard-zone-two.tpl
index 27df76a44..d164c8393 100644
--- a/modules/dashinsights/views/templates/hook/dashboard-zone-two.tpl
+++ b/modules/dashinsights/views/templates/hook/dashboard-zone-two.tpl
@@ -35,7 +35,7 @@
         <section>
             <div class="row">
                 <div class="col-md-12 col-lg-6">
-                    <p class="chart-label">{l s='Stay Nights' mod='dashinsights'}</p>
+                    <p class="chart-label">{l s='Room Nights' mod='dashinsights'}</p>
                     <div class="chart with-transitions insight-chart-wrap" id="dashinsights_room_nights">
                         <svg></svg>
                     </div>
diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php
index 1488c7a3f..4307437f9 100644
--- a/modules/statsproduct/statsproduct.php
+++ b/modules/statsproduct/statsproduct.php
@@ -356,9 +356,9 @@ class StatsProduct extends ModuleGraph
                 if (Tools::getValue('export')) {
                     $this->_titles['main'][] = $this->l('Date');
                 }
-                $this->_titles['main'][] = $this->l('Stay nights');
+                $this->_titles['main'][] = $this->l('Room nights');
                 $this->_titles['main'][] = $this->l('Views (x100)');
-                $this->_titles['y'] = $this->l('Stay nights, Views (x100)');
+                $this->_titles['y'] = $this->l('Room nights, Views (x100)');
                 $this->_formats['y'] = 'd';
 
                 $this->query[0] = 'SELECT o.`date_add`, SUM(DATEDIFF(hbd.`date_to`, hbd.`date_from`)) AS total
diff --git a/themes/hotel-reservation-theme/cart-total-block.tpl b/themes/hotel-reservation-theme/cart-total-block.tpl
index 485d32918..e9f88356b 100644
--- a/themes/hotel-reservation-theme/cart-total-block.tpl
+++ b/themes/hotel-reservation-theme/cart-total-block.tpl
@@ -25,7 +25,7 @@
     {if $total_rooms_wt + $total_additional_services_wt + $total_additional_services_auto_add_wt}
         <p>
             <span>
-                {l s='Total Room cost'}
+                {l s='Total rooms cost'}
                 {if $display_tax_label}
                     {if $use_taxes && $priceDisplay == 0}
                         {l s='(tax incl)'}
diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
index 4f73d6135..3009969dc 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
@@ -263,7 +263,7 @@
 							{block name='blockcart_layer_cart_room_total_price'}
 								<div class="layer_cart_row">
 									<strong class="dark">
-										{l s='Total Room Cost in cart' mod='blockcart'}
+										{l s='Total Rooms Cost in cart' mod='blockcart'}
 										{if $display_tax_label}
 											{if $priceDisplay == 1}
 												{l s='(tax excl.)' mod='blockcart'}
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
index cc2a6b413..fd2f8c34f 100644
--- a/themes/hotel-reservation-theme/order-confirmation.tpl
+++ b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -424,7 +424,7 @@
 														{if isset($cart_htl_data)}
 															<tr class="item">
 																<td>
-																	<strong>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</strong>
+																	<strong>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</strong>
 																</td>
 																<td class="text-right">
 																	{if $priceDisplay && $use_tax}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index 74ee88180..dd07a1224 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -337,7 +337,7 @@
                                         {assign var=total_standard_products_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE))}
                                         {if isset($cart_htl_data) && $cart_htl_data}
                                             <tr>
-                                                <td>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
+                                                <td>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
                                                 <td class="text-right">
                                                     {if $priceDisplay && $use_tax}
                                                         <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
@@ -765,7 +765,7 @@
 
                                         {if isset($cart_htl_data) && $cart_htl_data}
                                             <tr>
-                                                <td>{l s='Total Room Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
+                                                <td>{l s='Total Rooms Cost'} {if $use_taxes && $display_tax_label == 1}{if $priceDisplay == 1}{l s='(tax excl.)'}{elseif $priceDisplay == 0}{l s='(tax incl.)'}{/if} {/if}</td>
                                                 <td class="text-right">
                                                     {if $priceDisplay && $use_tax}
                                                         <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
@@ -1080,7 +1080,7 @@
                                 </div>
                                 <div class="card-footer">
                                     <div class="selected-rooms-wrap">
-                                        {l s='Selected: '}<span class="num-selected-stays">{l s='00'}</span>
+                                        {l s='Selected: '}<span class="num-selected-rooms">{l s='00'}</span>
                                     </div>
                                     <div class="actions-wrap">
                                         <button class="btn btn-secondary btn-cancel">
@@ -1101,7 +1101,7 @@
                                     <div class="errors" style="display: none;"></div>
 
                                     <div class="well well-sm">
-                                        <p class="text">{l s='Total cancel request:'} <span class="count-total-stays">{l s='00'}</span></p>
+                                        <p class="text">{l s='Total cancel request:'} <span class="count-total-rooms">{l s='00'}</span></p>
                                     </div>
 
                                     <div class="form-group">