diff --git a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
index ea04f6f11..c22482496 100644
--- a/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/carts/helpers/view/view.tpl
@@ -83,7 +83,7 @@
 					<th><span class="title_box">{l s='Hotel'}</span></th>
 					<th><span class="title_box">{l s='Duration'}</span></th>
 					<th><span class="title_box">{l s='occupancy'}</span></th>
-					<th><span class="title_box">{l s='Stay price'}</span></th>
+					<th><span class="title_box">{l s='Room price'}</span></th>
 					<th><span class="title_box">{l s='Extra services'}</span></th>
 					<th class="text-right"><span class="title_box">{l s='Total'}</span></th>
 				</tr>
diff --git a/admin/themes/default/template/controllers/import/helpers/form/form.tpl b/admin/themes/default/template/controllers/import/helpers/form/form.tpl
index 61870cf91..5d74f7313 100644
--- a/admin/themes/default/template/controllers/import/helpers/form/form.tpl
+++ b/admin/themes/default/template/controllers/import/helpers/form/form.tpl
@@ -318,7 +318,7 @@
 					{l s='Sample Room Types file'}
 				</a>
 				<a class="list-group-item _blank" href="../docs/csv_import/rooms_import.csv">
-					{l s='Sample Stays file'}
+					{l s='Sample Rooms file'}
 				</a>
 				<a class="list-group-item _blank" href="../docs/csv_import/service_products_import.csv">
 					{l s='Sample Service Products file'}
diff --git a/admin/themes/default/template/controllers/normal_products/informations.tpl b/admin/themes/default/template/controllers/normal_products/informations.tpl
index 1a008c063..20f1200d6 100644
--- a/admin/themes/default/template/controllers/normal_products/informations.tpl
+++ b/admin/themes/default/template/controllers/normal_products/informations.tpl
@@ -295,13 +295,13 @@
 	<div id="price_addition_type_container" {if !$product->auto_add_to_cart || !$product->isAssociatedToShop()}style="display:none;"{/if}>
 		<div class="form-group">
 			<label class="control-label col-lg-3" for="selling_preference_type">
-				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether price will be added in the base stay price or as Convenience Fee'}">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether price will be added in the base room price or as Convenience Fee'}">
 					{l s='Price display preference'}
 				<span>
 			</label>
 			<div class="col-lg-4">
 				<select name="price_addition_type" id="price_addition_type">
-					<option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}selected="selected"{/if} >{l s='Add price in stay price'}</option>
+					<option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}selected="selected"{/if} >{l s='Add price in room price'}</option>
 					<option value="{Product::PRICE_ADDITION_TYPE_INDEPENDENT}" {if $product->price_addition_type == Product::PRICE_ADDITION_TYPE_INDEPENDENT}selected="selected"{/if} >{l s='Add price as convenience Fee'}</option>
 				</select>
 			</div>
@@ -312,7 +312,7 @@
 					{l s='Select how this service price will be added in booking.'}
 					<ul>
 						<li>
-							<b>{l s='Add price in stay price'}</b> : {l s='Service price will be added in stay base price.'}<br>{l s='(e.g., Stay price : 500, service price: 50, final stay price : 550)'}
+							<b>{l s='Add price in room price'}</b> : {l s='Service price will be added in room base price.'}<br>{l s='(e.g., Room price : 500, service price: 50, final room price : 550)'}
 						</li>
 						<li><b>{l s='Add price as convenience fee'}</b> : {l s='Service price will be dispalyed in order summary as "Convenience Fees"'}</li>
 					</ul>
@@ -399,7 +399,7 @@
 	<div id="allow_multiple_quantity_container" {if $product->auto_add_to_cart && $product->isAssociatedToShop()}style="display:none;"{/if}>
 		<div class="form-group">
 			<label class="control-label col-lg-3">
-				<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, customer can order multiple quantity of product otherwise only one quantity can be purchased by customer per stay/hotel'}">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, customer can order multiple quantity of product otherwise only one quantity can be purchased by customer per room/hotel'}">
 					{l s='Allow ordering of multiple quantities'}
 				</span>
 			</label>
@@ -421,7 +421,7 @@
 			<div class="form-group">
 				<label class="control-label col-lg-3" for="max_quantity">
 					<span class="label-tooltip" data-toggle="tooltip"
-						title="{l s='Enter max allowed quantity per stay, enter 0 for unlimited.'}">
+						title="{l s='Enter max allowed quantity per room, enter 0 for unlimited.'}">
 						{l s='Max quantity allow'}
 					</span>
 				</label>
@@ -432,7 +432,7 @@
 			<div class="form-group">
 				<div class="col-lg-6 col-lg-offset-3">
 					<div class="alert alert-info">
-					{l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per stay.'}
+					{l s='By default all products have infinte quantity, Using this setting you can restrict customer to purchase only one product per room.'}
 					</div>
 				</div>
 			</div>
diff --git a/admin/themes/default/template/controllers/normal_products/prices.tpl b/admin/themes/default/template/controllers/normal_products/prices.tpl
index bb5813515..33ec72dfa 100644
--- a/admin/themes/default/template/controllers/normal_products/prices.tpl
+++ b/admin/themes/default/template/controllers/normal_products/prices.tpl
@@ -139,7 +139,7 @@ $(document).ready(function () {
 	<div class="form-group {if $product->auto_add_to_cart && $product->price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}show_on_auto_add_Withroom{/if}" {if !$product->auto_add_to_cart || $product->price_addition_type != Product::PRICE_ADDITION_TYPE_WITH_ROOM}style="display:none"{/if}>
 		<div class="col-lg-9 col-lg-offset-3">
 			<div class="alert alert-info">
-				{l s='This service product price will be auto added to stay price so the tax rule set on room type will be applied on this service product'}
+				{l s='This service product price will be auto added to room price so the tax rule set on room type will be applied on this service product'}
 			</div>
 		</div>
 	</div>
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 48b9de7f6..dff4ef810 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
@@ -33,8 +33,8 @@
 				{if isset($cart_detail_data) && $cart_detail_data}
 					<thead>
 						<tr>
-							<th><span class="title_box">{l s='Stay No.'}</span></th>
-							<th><span class="title_box">{l s='Stay Image'}</th>
+							<th><span class="title_box">{l s='Room No.'}</span></th>
+							<th><span class="title_box">{l s='Room Image'}</th>
 							<th><span class="title_box">{l s='Room Type'}</span></th>
 							<th><span class="title_box">{l s='Duration'}</span></th>
 							{if $occupancy_required_for_booking}
@@ -42,7 +42,7 @@
 						{/if}
 						<th><span class="title_box">{l s='Unit Price (tax excl)'}</span></th>
 							<th><span class="title_box">{l s='Extra Services / Fees (tax excl)'}</span></th>
-							{* <th><span class="title_box">{l s='Total Stays Price (tax excl)'}</span></th> *}
+							{* <th><span class="title_box">{l s='Total Rooms Price (tax excl)'}</span></th> *}
 							<th><span class="title_box">{l s='Total Price (tax excl)'}</span></th>
 							<th></th>
 						</tr>
@@ -77,7 +77,7 @@
 													<input type="hidden" class="max_children" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_children']|escape:'html':'UTF-8'}{/if}">
 													<input type="hidden" class="max_guests" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_guests']|escape:'html':'UTF-8'}{/if}">
 													<div class="occupancy_info_block selected" occ_block_index="0">
-														<div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Stay - 1'}</span></div>
+														<div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Room - 1'}</span></div>
 														<div class="row">
 															<div class="col-xs-6 occupancy_count_block">
 																<div class="col-sm-12">
diff --git a/admin/themes/default/template/controllers/orders/_overbookings.tpl b/admin/themes/default/template/controllers/orders/_overbookings.tpl
index 791a8306c..95711a30f 100644
--- a/admin/themes/default/template/controllers/orders/_overbookings.tpl
+++ b/admin/themes/default/template/controllers/orders/_overbookings.tpl
@@ -29,7 +29,7 @@
             <div class="table-responsive form-group">
                 <table class="table table-striped">
                     <tr>
-                        <th>{l s='Stay No.'}</th>
+                        <th>{l s='Room No.'}</th>
                         <th>{l s='Room type.'}</th>
                         <th>{l s='Duration'}</th>
                         <th>{l s='Occupancy'}</th>
@@ -76,7 +76,7 @@
                                     {/if}
                                 </td>
                                 <td>
-                                    <a href="#" class="btn btn-default reallocate_overbooking" id_htl_booking="{$data['id']}"><i class="icon-refresh"></i> {l s='Reallocate/Swap Stay'}</a>
+                                    <a href="#" class="btn btn-default reallocate_overbooking" id_htl_booking="{$data['id']}"><i class="icon-refresh"></i> {l s='Reallocate/Swap Room'}</a>
                                 </td>
                                 <td>
                                     {if isset($data['booked_room_info']) && $data['booked_room_info']}
@@ -91,8 +91,8 @@
             </div>
 
             <div class="help-block">
-                <p>- {l s='You can resolve stay overbooking with \'Resolve\' column only when the overbooked stay is now free for booked duration.'}</p>
-                <p>- {l s='You can also reallocate an overbooked stay with an available stay to resolve stay\'s overbooking.'}</p>
+                <p>- {l s='You can resolve room overbooking with \'Resolve\' column only when the overbooked room is now free for booked duration.'}</p>
+                <p>- {l s='You can also reallocate an overbooked room with an available room to resolve room\'s overbooking.'}</p>
             </div>
         </div>
     </div>
diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl
index 1eef158f6..a27076f75 100644
--- a/admin/themes/default/template/controllers/orders/_product_line.tpl
+++ b/admin/themes/default/template/controllers/orders/_product_line.tpl
@@ -34,7 +34,7 @@
 			{include file="controllers/products/connected-rooms.tpl" htl_connected_rooms=$data['connected_rooms'][$data.id_room]}
 		{/if}
     </td>
-	<td class="center"><img width="80px" src="{$data.image_link}" title="{l s='Stay image'}"></td>
+	<td class="center"><img width="80px" src="{$data.image_link}" title="{l s='Room image'}"></td>
 	<td class="center">
 		{assign var="is_full_date" value=($show_full_date && ($data['date_from']|date_format:'%D' == $data['date_to']|date_format:'%D'))}
 		<p>{dateFormat date=$data.date_from full=$is_full_date}</p>
@@ -110,7 +110,7 @@
 			</span>
 			<div class="price_info_container" style="display: none;">
 				<div>
-					<label>{l s='Stay & Service Tax:'}</label>
+					<label>{l s='Room & Service Tax:'}</label>
 					<span class="pull-right">{convertPriceWithCurrency price=$data.total_room_service_tax_only currency=$currency->id}</span>
 				</div>
 				{if isset($data.tourism_tax_total) && $data.tourism_tax_total > 0}
@@ -181,7 +181,7 @@
                         <li>
                             <a href="#" class="room_reallocate_swap" id="reallocate_room_{$data['id']}" data-room_type_name="{$data['room_type_name']}" data-toggle="modal" data-target="#mySwappigModal" data-id_htl_booking="{$data['id']}" data-id_order="{$data['id_order']}" data-room_num='{$data.room_num}' data-id_room_type='{$data.id_product}' data-cust_name='{$data.alloted_cust_name}' data-cust_email='{$data.alloted_cust_email}' data-avail_rm_swap='{$data.avail_rooms_to_swap|@json_encode}' data-avail_realloc_room_types='{$data.avail_room_types_to_realloc|@json_encode}' data-allotment_type='{$data.booking_type}' data-allotment_type_label='{if $data.booking_type == $ALLOTMENT_MANUAL}{l s='Manual'}{else}{l s='Auto'}{/if}' data-comment='{$data.comment}'>
                                 <i class="icon-refresh"></i>
-                                {l s='Reallocate/Swap Stay'}
+                                {l s='Reallocate/Swap Room'}
                             </a>
                         </li>
                         <li>
diff --git a/admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl b/admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl
index 23760ad40..3bec3331c 100644
--- a/admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl
+++ b/admin/themes/default/template/controllers/orders/_resolvable_overbookings.tpl
@@ -41,7 +41,7 @@
             <div class="table-responsive form-group">
                 <table class="table table-striped">
                     <tr>
-                        <th>{l s='Stay No.'}</th>
+                        <th>{l s='Room No.'}</th>
                         <th>{l s='Room type'}</th>
                         <th>{l s='Hotel'}</th>
                         <th>{l s='Duration'}</th>
diff --git a/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl b/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl
index 07e38dd9d..189b9a7a8 100644
--- a/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl
+++ b/admin/themes/default/template/controllers/orders/_rooms_informaion_table.tpl
@@ -27,7 +27,7 @@
                 <table class="table" id="customer_cart_details">
                     <thead>
                         <tr>
-                            <th class="center"><span ><p>{l s='Stay'}</p></span></th>
+                            <th class="center"><span ><p>{l s='Unit'}</p></span></th>
                             <th class="center"><span >{l s='Image'}</span></th>
                             <th class="center"><span class="title_box help-tooltip" data-toggle="tooltip" title="" data-original-title="{l s='Booking check-in and check-out dates'}">{l s='Duration'}</span></th>
                             <th class="center"><span class="title_box help-tooltip" data-toggle="tooltip" title="" data-original-title="{l s='Number of adults and children'}">{l s='Occupancy'}</span></th>
@@ -60,7 +60,7 @@
     <div class="list-empty">
         <div class="list-empty-msg">
             <i class="icon-warning-sign list-empty-icon"></i>
-            {l s='Stay information not available.'}
+            {l s='Room information not available.'}
         </div>
     </div>
 {/if}
diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index 6f930aca7..e18a07406 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -2267,7 +2267,7 @@
                 <div class="row">
                     <div class="col-lg-2">
                         <div class="data-focus">
-                            <span>{l s='Total stays (Tax excl.)'}</span><br/>
+                            <span>{l s='Total rooms (Tax excl.)'}</span><br/>
                             <span id="total_rooms" class="size_l text-success"></span>
                         </div>
                     </div>
@@ -2303,7 +2303,7 @@
 							<span id="total_taxes" class="size_l"></span>
 							<div class="price_info_container" style="display: none;">
 								<div>
-									<label>{l s='Stay & Service Tax:'}</label>
+									<label>{l s='Room & Service Tax:'}</label>
 									<span class="pull-right" id="total_taxes_vat"></span>
 								</div>
 								<div>
@@ -2475,8 +2475,8 @@
 	{addJsDef max_child_age=$max_child_age}
 	{addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL}
 	{addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL}
-	{addJsDefL name='room_txt'}{l s='Stay' js=1}{/addJsDefL}
-	{addJsDefL name='rooms_txt'}{l s='Stays' js=1}{/addJsDefL}
+	{addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL}
+	{addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL}
 	{addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL}
 	{addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL}
 	{addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL}
@@ -2485,7 +2485,7 @@
 	{addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL}
 	{addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL}
 	{addJsDefL name='all_children_txt'}{l s='All Children' js=1}{/addJsDefL}
-	{addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum stay occupancy reached' js=1}{/addJsDefL}
+	{addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum room occupancy reached' js=1}{/addJsDefL}
 	{addJsDefL name='max_adults_txt'}{l s='Maximum adult occupancy reached' js=1}{/addJsDefL}
 	{addJsDefL name='max_children_txt'}{l s='Maximum children occupancy reached' js=1}{/addJsDefL}
 	{addJsDefL name='no_children_allowed_txt'}{l s='Only adults can be accommodated' js=1}{/addJsDefL}
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
index 30b74954e..62c361568 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -680,7 +680,7 @@
                                         <tr>
                                             <th>{l s='Request ID'}</th>
                                             {if isset($refundReqBookings) && $refundReqBookings}
-                                                <th>{l s='Total Stays'}</th>
+                                                <th>{l s='Total Rooms'}</th>
                                             {/if}
                                             {if isset($refundReqProducts) && $refundReqProducts}
                                                 <th>{l s='Total Products'}</th>
@@ -766,10 +766,10 @@
                     {if $hotel_booking}
                         <div class="panel">
                             <div class="panel-heading">
-                                <i class="icon-bed"></i> &nbsp;{l s='Stays Booking Detail'} <span class="badge">{$order_detail_data|@count}</span>
+                                <i class="icon-bed"></i> &nbsp;{l s='Booking Detail'} <span class="badge">{$order_detail_data|@count}</span>
                                 {if $can_edit && ($currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED') && $currentState->id != Configuration::get('PS_OS_NO_SHOW'))}
                                     <button type="button" id="add_room" class="btn btn-primary pull-right">
-                                        <i class="icon-plus-sign"></i> {l s='Add Stays'}
+                                        <i class="icon-plus-sign"></i> {l s='Add Rooms'}
                                     </button>
                                 {/if}
                                 {if isset($use_tourism_tax) && $use_tourism_tax && $order_detail_data}
@@ -908,7 +908,7 @@
 
                             {if $total_rooms_price_tax_excl}
                                 <tr id="total_products">
-                                    <td class="text-right">{l s='Total Stays Cost (Tax excl.)'}</td>
+                                    <td class="text-right">{l s='Total Rooms Cost (Tax excl.)'}</td>
                                     <td class="amount text-right nowrap">
                                         {displayPrice price=$total_rooms_price_tax_excl currency=$currency->id}
                                     </td>
@@ -982,7 +982,7 @@
                                             <tbody>
                                                 {if $total_rooms_price_tax_excl && $total_rooms_tax_only > 0}
                                                     <tr>
-                                                        <td class="text-left">{l s='Total Stays Tax'}</td>
+                                                        <td class="text-left">{l s='Total Rooms Tax'}</td>
                                                         <td class="text-right">
                                                             {displayPrice price=$total_rooms_tax_only currency=$currency->id}
                                                         </td>
@@ -1321,12 +1321,12 @@
         </div>
     </div>
     {strip}
-        {addJsDefL name=no_rm_avail_txt}{l s='No stay available.' js=1}{/addJsDefL}
-        {addJsDefL name=no_realloc_rm_avail_txt}{l s='No stay available for reallocation.' js=1}{/addJsDefL}
+        {addJsDefL name=no_rm_avail_txt}{l s='No room available.' js=1}{/addJsDefL}
+        {addJsDefL name=no_realloc_rm_avail_txt}{l s='No room available for reallocation.' js=1}{/addJsDefL}
         {addJsDefL name=no_realloc_rm_type_avail_txt}{l s='No room type available for reallocation.' js=1}{/addJsDefL}
-        {addJsDefL name=no_swap_rm_avail_txt}{l s='No stay available for swap.' js=1}{/addJsDefL}
+        {addJsDefL name=no_swap_rm_avail_txt}{l s='No room available for swap.' js=1}{/addJsDefL}
         {addJsDefL name=slct_rm_type_err}{l s='Please select a room type first.' js=1}{/addJsDefL}
-        {addJsDefL name=slct_rm_err}{l s='Please select a stay first.' js=1}{/addJsDefL}
+        {addJsDefL name=slct_rm_err}{l s='Please select a room first.' js=1}{/addJsDefL}
         {addJsDefL name=txtExtraServiceSucc}{l s='Updated Successfully' js=1}{/addJsDefL}
         {addJsDefL name=atleastSelectTxt}{l s='Select at least one facility to update.' js=1}{/addJsDefL}
 
@@ -1335,8 +1335,8 @@
         {addJsDefL name=txtInvalidServiceVal}{l s='Invalid service value found' js=1}{/addJsDefL}
         {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL}
         {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL}
-        {addJsDefL name='room_txt'}{l s='Stay' js=1}{/addJsDefL}
-        {addJsDefL name='rooms_txt'}{l s='Stays' js=1}{/addJsDefL}
+        {addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL}
+        {addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL}
         {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL}
         {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL}
         {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL}
@@ -1345,12 +1345,12 @@
         {addJsDefL name='below_txt'}{l s='Below' js=1}{/addJsDefL}
         {addJsDefL name='years_txt'}{l s='years' js=1}{/addJsDefL}
         {addJsDefL name='all_children_txt'}{l s='All Children' js=1}{/addJsDefL}
-        {addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum stay occupancy reached' js=1}{/addJsDefL}
+        {addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum room occupancy reached' js=1}{/addJsDefL}
         {addJsDefL name='max_adults_txt'}{l s='Maximum adult occupancy reached' js=1}{/addJsDefL}
         {addJsDefL name='max_children_txt'}{l s='Maximum children occupancy reached' js=1}{/addJsDefL}
         {addJsDefL name='no_children_allowed_txt'}{l s='Only adults can be accommodated' js=1}{/addJsDefL}
         {addJsDefL name='invalid_occupancy_txt'}{l s='Invalid occupancy(adults/children) found.' js=1}{/addJsDefL}
-        {addJsDefL name='select_room_txt'}{l s='Select stay' js=1}{/addJsDefL}
+        {addJsDefL name='select_room_txt'}{l s='Select room' js=1}{/addJsDefL}
         {addJsDefL name='room_status_sealed_warning_txt'}{l s='Are you sure? You cannot change the booking status after this.' js=1}{/addJsDefL}
         {addJsDef max_child_age=$max_child_age|escape:'quotes':'UTF-8'}
         {addJsDef ROOM_STATUS_CHECKED_IN=$ROOM_STATUS_CHECKED_IN|escape:'quotes':'UTF-8'}
diff --git a/admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl
index 6f13804db..7cadd35f1 100644
--- a/admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl
@@ -166,7 +166,7 @@
                     <div id="new_service_price_addition_type_container" class="col-sm-6" style="display:none;">
                         <label class="control-label">{l s='Price display preference'}</label>
                         <select name="new_service_price_addition_type" id="new_service_price_addition_type">
-                            <option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}">{l s='Add price in stay price'}</option>
+                            <option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}">{l s='Add price in room price'}</option>
                             <option value="{Product::PRICE_ADDITION_TYPE_INDEPENDENT}">{l s='Add price as convenience Fee'}</option>
                         </select>
                     </div>
diff --git a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
index f48ce6bf5..93519081a 100644
--- a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
@@ -86,7 +86,7 @@
                                         <input type="hidden" class="max_children" value="">
                                         <input type="hidden" class="max_guests" value="">
                                         <div class="occupancy_info_block row" occ_block_index="0">
-                                            <div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Stay - 1'}</label></div>
+                                            <div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Room - 1'}</label></div>
                                             <div class="col-sm-12">
                                                 <div class="row">
                                                     <div class="form-group col-xs-6 occupancy_count_block">
@@ -113,7 +113,7 @@
                                         </div>
                                     </div>
                                     <div class="add_occupancy_block">
-                                        <a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Stay'}</span></a>
+                                        <a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Room'}</span></a>
                                     </div>
                                 </div>
                             </div>
@@ -122,7 +122,7 @@
                 {else}
                     <div class="form-group row">
                         <div class="col-sm-6">
-                            <label class="control-label">{l s='No. of stays'}</label>
+                            <label class="control-label">{l s='No. of rooms'}</label>
                             <input type="number" class="form-control" name="add_product[product_quantity]" id="add_product_product_quantity" value="1" disabled="disabled" min="1"/>
                         </div>
                     </div>
diff --git a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
index 9d0ab45ad..a4e541bf3 100644
--- a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
@@ -25,7 +25,7 @@
         {if $bookingOrderInfo|count > 0 && $serviceProducts|count > 0}
             <ul class="nav nav-tabs" role="tablist">
                 <li role="presentation" class="active">
-                    <a href="#refund_rooms_tab" role="tab" data-toggle="tab">{l s='Stays'}</a>
+                    <a href="#refund_rooms_tab" role="tab" data-toggle="tab">{l s='Rooms'}</a>
                 </li>
                 <li role="presentation">
                     <a href="#refund_products_tab" aria-controls="products" role="tab" data-toggle="tab">{l s='Products'}</a>
@@ -43,7 +43,7 @@
                             <thead>
                                 <tr>
                                     <th></th>
-                                    <th>{l s='Stay No.'}</th>
+                                    <th>{l s='Room No.'}</th>
                                     <th>{l s='Room Type'}</th>
                                     <th>{l s='Property Name'}</th>
                                     <th>{l s='Duration'}</th>
@@ -111,7 +111,7 @@
         <div class="list-empty">
             <div class="list-empty-msg">
                 <i class="icon-warning-sign list-empty-icon"></i>
-                {l s='No stay bookings found to refund.'}
+                {l s='No room bookings found to refund.'}
             </div>
         </div>
     {/if}
diff --git a/admin/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl
index 5496176e5..7a30ad954 100644
--- a/admin/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_edit_room_booking.tpl
@@ -24,7 +24,7 @@
     <div id="edit_product">
         <ul class="nav nav-tabs" role="tablist">
             <li role="presentation" class="active">
-                <a href="#edit_room_tab" role="tab" data-toggle="tab">{l s='Stays'}</a>
+                <a href="#edit_room_tab" role="tab" data-toggle="tab">{l s='Rooms'}</a>
             </li>
             <li role="presentation">
                 <a href="#room_type_service_product_desc" aria-controls="services" role="tab" data-toggle="tab">{l s='Services'}</a>
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 d4e315c87..7c7ea9a86 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
@@ -92,7 +92,7 @@
                             <input type="hidden" class="max_children" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_children']|escape:'html':'UTF-8'}{/if}">
                             <input type="hidden" class="max_guests" value="{if isset($data['room_type_info'])}{$data['room_type_info']['max_guests']|escape:'html':'UTF-8'}{/if}">
                                 <div class="occupancy_info_block" occ_block_index="0">
-                                    <div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Stay - 1'}</span></div>
+                                    <div class="occupancy_info_head col-sm-12"><span class="room_num_wrapper">{l s='Room - 1'}</span></div>
                                     <div class="row">
                                         <div class="col-xs-6 occupancy_count_block">
                                             <div class="col-sm-12">
diff --git a/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl b/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl
index d88048a24..1abace1e4 100644
--- a/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_extra_services_service_products_tab_content.tpl
@@ -166,7 +166,7 @@
                         <button type="submit" id="save_service_service" class="btn btn-primary"><i class="icon icon-save"></i> &nbsp;{l s="Update Services"}</button>
                     </div>
 				{else}
-					<i class="icon-warning"></i> {l s='No services available to add to this stay.'}
+					<i class="icon-warning"></i> {l s='No services available to add to this room.'}
 				{/if}
 			</div>
 			<input type="hidden" name="id_booking_detail" value="{$id_booking_detail}">
@@ -225,7 +225,7 @@
                     <div id="new_service_price_addition_type_container" class="col-sm-6" style="display:none;">
                         <label class="control-label">{l s='Price display preference'}</label>
                         <select name="new_service_price_addition_type" id="new_service_price_addition_type">
-                            <option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}">{l s='Add price in stay price'}</option>
+                            <option value="{Product::PRICE_ADDITION_TYPE_WITH_ROOM}">{l s='Add price in room price'}</option>
                             <option value="{Product::PRICE_ADDITION_TYPE_INDEPENDENT}">{l s='Add price as convenience Fee'}</option>
                         </select>
                     </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 804b47c01..4d5a25cb8 100644
--- a/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_room_reallocation.tpl
@@ -23,17 +23,17 @@
 <div class="modal-body">
     <ul class="nav nav-tabs" role="tablist">
         <li role="presentation" class="active">
-            <a  href="#reallocate_room_tab" aria-controls="reallocate" role="tab" data-toggle="tab">{l s='Stay Reallocation'}</a>
+            <a  href="#reallocate_room_tab" aria-controls="reallocate" role="tab" data-toggle="tab">{l s='Room Reallocation'}</a>
         </li>
         <li role="presentation">
-            <a  href="#swap_room_tab" aria-controls="swap" role="tab" data-toggle="tab">{l s='Swap Stay'}</a>
+            <a  href="#swap_room_tab" aria-controls="swap" role="tab" data-toggle="tab">{l s='Swap Room'}</a>
         </li>
     </ul>
     <div class="tab-content active">
         <div role="tabpanel" class="tab-pane active" id="reallocate_room_tab">
             <div class="row">
                 <dl class="list-detail col-sm-6">
-                    <label class="label-title">{l s='Current Stay Number'}</label>
+                    <label class="label-title">{l s='Current Room Number'}</label>
                     <dd><i class="icon-bed"></i> &nbsp;<span class="modal_curr_room_num"></span></dd>
                 </dl>
                 <dl class="list-detail col-sm-6">
@@ -68,10 +68,10 @@
                             <p class="error_text" id="realloc_sel_rm_type_err_p"></p>
                         </div>
                         <div class="form-group col-sm-6">
-                            <label for="realloc_avail_rooms" class="control-label model-label">{l s='Stay To Reallocate:'}</label>
+                            <label for="realloc_avail_rooms" class="control-label model-label">{l s='Room To Reallocate:'}</label>
                             <div class="realloc_avail_rooms_container">
                                 <select class="form-control" name="realloc_avail_rooms" id="realloc_avail_rooms">
-                                    <option value="0" selected="selected">{l s='Select Stays'}</option>
+                                    <option value="0" selected="selected">{l s='Select Rooms'}</option>
                                 </select>
                             </div>
                             <p class="error_text" id="realloc_sel_rm_err_p"></p>
@@ -111,7 +111,7 @@
         <div role="tabpanel" class="tab-pane" id="swap_room_tab">
             <div class="row">
                 <dl class="list-detail col-sm-6">
-                    <label class="label-title">{l s='Current Stay Number'}</label>
+                    <label class="label-title">{l s='Current Room Number'}</label>
                     <dd><i class="icon-bed"></i> &nbsp;<span class="modal_curr_room_num"></span></dd>
                 </dl>
                 <dl class="list-detail col-sm-6">
@@ -137,7 +137,7 @@
                 <div class="form-group">
                     <div class="row">
                         <div class="col-sm-6">
-                            <label for="swap_avail_rooms" class="control-label model-label">{l s='Available stays to swap'}</label>
+                            <label for="swap_avail_rooms" class="control-label model-label">{l s='Available rooms to swap'}</label>
                             <input type="hidden" class="form-control modal_id_htl_booking" name="id_htl_booking">
                             <div class="swap_avail_rooms_container"></div>
 
diff --git a/admin/themes/default/template/controllers/products/booked_room_date_ranges_list.tpl b/admin/themes/default/template/controllers/products/booked_room_date_ranges_list.tpl
index 36e240443..b5555cbcf 100644
--- a/admin/themes/default/template/controllers/products/booked_room_date_ranges_list.tpl
+++ b/admin/themes/default/template/controllers/products/booked_room_date_ranges_list.tpl
@@ -20,7 +20,7 @@
 * @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
 *}
 
-{sprintf({l s='The stay "%s" already has a booking for the selected date range.'}, $orderDetails->room_num)}
+{sprintf({l s='The room "%s" already has a booking for the selected date range.'}, $orderDetails->room_num)}
 <div class="row">
     <div class="col-xs-12">
         <span class="error_message_label">{l s='Order ID'}:</span> <a href="{$link->getAdminLink('AdminOrders')}&id_order={$orderDetails->id_order}&vieworder" target="_blank"><strong>#{$orderDetails->id_order|intval}</strong></a>
diff --git a/admin/themes/default/template/controllers/products/configuration.tpl b/admin/themes/default/template/controllers/products/configuration.tpl
index f6fa7790e..07bf182ba 100644
--- a/admin/themes/default/template/controllers/products/configuration.tpl
+++ b/admin/themes/default/template/controllers/products/configuration.tpl
@@ -667,7 +667,7 @@
                 }
             } else {
                 $('#room-dates-modal .room-booked-dates-table tbody').append(`<tr>
-                    <td colspan="3" class="center">{/literal}{l s='No Booking for this stay'}{literal}</td>
+                    <td colspan="3" class="center">{/literal}{l s='No Booking for this room'}{literal}</td>
                 </tr>`);
             }
         });
@@ -1244,7 +1244,7 @@
                 });
             },
             submitBulkDelete: function() {
-                if (confirm("{l s='Delete selected stays?'}")) {
+                if (confirm("{l s='Delete selected rooms?'}")) {
                     $('#product_form').append('<input type="hidden" name="submitBulkDeleteRooms" value="1"/>');
                     $('form#product_form').submit();
                 }
diff --git a/admin/themes/default/template/controllers/products/informations.tpl b/admin/themes/default/template/controllers/products/informations.tpl
index 3813de27f..12b92de65 100644
--- a/admin/themes/default/template/controllers/products/informations.tpl
+++ b/admin/themes/default/template/controllers/products/informations.tpl
@@ -151,7 +151,24 @@
 		{/if}
 	</div>
 
+	{if isset($selling_object_info) && $selling_object_info}
+		<div class="form-group" id="room_type_selection">
+			<label class="control-label col-sm-3">
+				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select the room selling type for this room type.'}">
+					{l s='Selling Object'}
+				</span>
+			</label>
+			<div class="col-sm-5">
+				<select name="id_selling_object" id="id_selling_object" class="form-control chosen" >
+					{foreach from=$selling_object_info item=selling_object_type}
+						<option value="{$selling_object_type['id_room_type_selling_object']}" {if isset($selected_room_type_selling_object) && $selling_object_type['id_room_type_selling_object'] == $selected_room_type_selling_object}selected{/if}>{$selling_object_type['name']}</option>
+					{/foreach}
+				</select>
+			</div>
+		</div>
+	{/if}
 
+	
 	<div class="form-group hidden">
 		<label class="control-label col-lg-3" for="reference">
 			<span class="label-tooltip" data-toggle="tooltip"
@@ -465,24 +482,6 @@
 		</div>
 	{/if}
 
-	{if isset($selling_object_info) && $selling_object_info}
-		<div class="form-group" id="room_type_selection">
-			<label class="control-label col-sm-3">
-				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select the stay selling type for this room type.'}">
-					{l s='Selling Object'}
-				</span>
-			</label>
-			<div class="col-sm-5">
-				<select name="id_selling_object" id="id_selling_object" class="form-control chosen" >
-					{foreach from=$selling_object_info item=selling_object_type}
-						<option value="{$selling_object_type['id_room_type_selling_object']}" {if isset($selected_room_type_selling_object) && $selling_object_type['id_room_type_selling_object'] == $selected_room_type_selling_object}selected{/if}>{$selling_object_type['name']}</option>
-					{/foreach}
-				</select>
-			</div>
-		</div>
-	{/if}
-
-
 	{* <div class="form-group">
 		<label class="control-label col-lg-3" for="tags_{$id_lang}">
 			<span class="label-tooltip" data-toggle="tooltip"
diff --git a/admin/themes/default/template/controllers/products/occupancy.tpl b/admin/themes/default/template/controllers/products/occupancy.tpl
index c6ddfaed5..5b2b7d908 100644
--- a/admin/themes/default/template/controllers/products/occupancy.tpl
+++ b/admin/themes/default/template/controllers/products/occupancy.tpl
@@ -58,15 +58,15 @@
         <hr>
 
         <div class="alert alert-info">
-            {l s='Below, enter the maximum number of adults and children which can be accommodated in a stay of this room type.'}
+            {l s='Below, enter the maximum number of adults and children which can be accommodated in a room of this room type.'}
 			<br>
-            {l s='For maximum stay occupancy, the total number of guests which can be accommodated in a stay of this room type.'}
+            {l s='For maximum room occupancy, the total number of guests which can be accommodated in a room of this room type.'}
         </div>
 
         <div class="form-group">
 			<label class="control-label col-sm-2" for="max_adults">
                 <span class="label-tooltip" data-toggle="tooltip"
-				title="{l s='Enter maximum number of adults can be accommodated in a stay of this room type.'}">
+				title="{l s='Enter maximum number of adults can be accommodated in a room of this room type.'}">
                     {l s='Maximum adults'}
                 </span>
 			</label>
@@ -77,7 +77,7 @@
         <div class="form-group">
 			<label class="control-label col-sm-2" for="max_children">
                 <span class="label-tooltip" data-toggle="tooltip"
-				title="{l s='Enter maximum number of children can be accommodated in a stay of this room type.'}">
+				title="{l s='Enter maximum number of children can be accommodated in a room of this room type.'}">
                     {l s='Maximum children'}
                 </span>
 			</label>
@@ -88,8 +88,8 @@
         <div class="form-group">
 			<label class="control-label col-sm-2" for="max_guests">
                 <span class="label-tooltip" data-toggle="tooltip"
-				title="{l s='Enter maximum number of guests can be accommodated in a stay of this room type.'}">
-                    {l s='Maximum stay occupancy'}
+				title="{l s='Enter maximum number of guests can be accommodated in a room of this room type.'}">
+                    {l s='Maximum room occupancy'}
                 </span>
 			</label>
 			<div class="col-sm-3">
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index 3d08b7390..c90e51990 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -184,10 +184,10 @@ class AdminFeaturesControllerCore extends AdminController
             $image = "<img class='img-thumbnail img-responsive' style='max-width:100px' src='".$img_url."'>";
         }
 
-        $this->toolbar_title = $this->l('Add a new stay feature');
+        $this->toolbar_title = $this->l('Add a new room feature');
         $this->fields_form = array(
             'legend' => array(
-                'title' => $this->l('Stay feature'),
+                'title' => $this->l('Room feature'),
                 'icon' => 'icon-info-sign'
             ),
             'input' => array(
@@ -197,16 +197,16 @@ class AdminFeaturesControllerCore extends AdminController
                     'name' => 'name',
                     'lang' => true,
                     'size' => 33,
-                    'hint' => $this->l('Enter a name for the stay feature. Invalid characters:').' <>;=#{}',
+                    'hint' => $this->l('Enter a name for the room feature. Invalid characters:').' <>;=#{}',
                     'required' => true
                 ),
                 array(
                     'type' => 'file',
-                    'label' => $this->l('Stay Feature Logo'),
+                    'label' => $this->l('Room Feature Logo'),
                     'name' => 'logo',
                     'image' => $img_exist ? $image : false,
                     'display_image' => true,
-                    'hint' => $this->l('Upload a stay feature logo.'),
+                    'hint' => $this->l('Upload a room feature logo.'),
                     'required' => true
                 )
             )
@@ -242,13 +242,13 @@ class AdminFeaturesControllerCore extends AdminController
         if (empty($this->display)) {
             $this->page_header_toolbar_btn['new_feature'] = array(
                 'href' => self::$currentIndex.'&addfeature&token='.$this->token,
-                'desc' => $this->l('Add new stay feature', null, null, false),
+                'desc' => $this->l('Add new room feature', null, null, false),
                 'icon' => 'process-icon-new'
             );
 
             // $this->page_header_toolbar_btn['new_feature_value'] = array(
             //     'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
-            //     'desc' => $this->l('Add new stay feature value', null, null, false),
+            //     'desc' => $this->l('Add new room feature value', null, null, false),
             //     'icon' => 'process-icon-new'
             // );
         }
@@ -256,7 +256,7 @@ class AdminFeaturesControllerCore extends AdminController
         if ($this->display == 'view') {
             $this->page_header_toolbar_btn['new_feature_value'] = array(
                 'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
-                'desc' => $this->l('Add new stay feature value', null, null, false),
+                'desc' => $this->l('Add new room feature value', null, null, false),
                 'icon' => 'process-icon-new'
             );
         }
@@ -302,7 +302,7 @@ class AdminFeaturesControllerCore extends AdminController
             case 'view':
                 $this->toolbar_btn['newAttributes'] = array(
                     'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token,
-                    'desc' => $this->l('Add new stay feature values')
+                    'desc' => $this->l('Add new room feature values')
                 );
                 $this->toolbar_btn['back'] = array(
                     'href' => self::$currentIndex.'&token='.$this->token,
@@ -320,12 +320,12 @@ class AdminFeaturesControllerCore extends AdminController
 
         switch ($this->display) {
             case 'edit':
-                $bread_extended[] = $this->l('Edit New Stay Feature');
+                $bread_extended[] = $this->l('Edit New Room Feature');
                 $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
                 break;
 
             case 'add':
-                $bread_extended[] = $this->l('Add New Stay Feature');
+                $bread_extended[] = $this->l('Add New Room Feature');
                 $this->addMetaTitle($bread_extended[count($bread_extended) - 1]);
                 break;
 
@@ -376,13 +376,13 @@ class AdminFeaturesControllerCore extends AdminController
 
         $this->fields_form[0]['form'] = array(
             'legend' => array(
-                'title' => $this->l('Stay feature value'),
+                'title' => $this->l('Room feature value'),
                 'icon' => 'icon-info-sign'
             ),
             'input' => array(
                 array(
                     'type' => 'select',
-                    'label' => $this->l('Stay feature'),
+                    'label' => $this->l('Room feature'),
                     'name' => 'id_feature',
                     'options' => array(
                         'query' => Feature::getFeatures($this->context->language->id),
@@ -450,7 +450,7 @@ class AdminFeaturesControllerCore extends AdminController
         $helper->allow_employee_form_lang = $this->allow_employee_form_lang;
         $helper->fields_value = $this->getFieldsValue($feature_value);
         $helper->toolbar_btn = $this->toolbar_btn;
-        $helper->title = $this->l('Add a new stay feature value');
+        $helper->title = $this->l('Add a new room feature value');
         $this->content .= $helper->generateForm($this->fields_form);
     }
 
@@ -488,7 +488,7 @@ class AdminFeaturesControllerCore extends AdminController
             }
         } else {
             $url = '<a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performance').'</a>';
-            $this->displayWarning(sprintf($this->l('This stay feature has been disabled. You can activate it here: %s.'), $url));
+            $this->displayWarning(sprintf($this->l('This room feature has been disabled. You can activate it here: %s.'), $url));
         }
 
         $this->context->smarty->assign(
@@ -647,7 +647,7 @@ class AdminFeaturesControllerCore extends AdminController
                     // upload feature image
                     $imgPath = _PS_IMG_DIR_.'rf/'.$objFeature->id.'.jpg';
                     if (!ImageManager::resize($featureImage['tmp_name'], $imgPath)) {
-                        $this->errors[] = $this->l('Some error occurred while uploding stay feature logo. Please try again.');
+                        $this->errors[] = $this->l('Some error occurred while uploding room feature logo. Please try again.');
                     }
                 }
             }
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 566921f2a..7236fb930 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -80,7 +80,7 @@ class AdminImportControllerCore extends AdminController
         $this->entities = array(
             $this->l('Properties'),
             $this->l('Room Types'),
-            $this->l('Stays'),
+            $this->l('Rooms'),
             $this->l('Categories'),
             $this->l('Service Products'),
             $this->l('Bookings'),
@@ -191,7 +191,7 @@ class AdminImportControllerCore extends AdminController
                     'base_children' => array('label' => $this->l('Base children')),
                     'max_adults' => array('label' => $this->l('Maximum adults')),
                     'max_children' => array('label' => $this->l('Maximum children')),
-                    'max_room_occupancy' => array('label' => $this->l('Maximum stay occupancy')),
+                    'max_room_occupancy' => array('label' => $this->l('Maximum room occupancy')),
                     'show_at_front' => array('label' => $this->l('Show at front (0/1)')),
                     'id_service_products' => array('label' => $this->l('Service products IDs (x, y, z...)')),
                     'id_features' => array('label' => $this->l('Feature IDs (x, y, z...)')),
@@ -221,17 +221,17 @@ class AdminImportControllerCore extends AdminController
                     'date_upd' => date('Y-m-d H:i:s'),
                 );
             break;
-            case $this->entities[$this->l('Stays')]:
+            case $this->entities[$this->l('Rooms')]:
                 $this->required_fields = array('room_num', 'id_status', 'id_product');
 
                 self::$validators['dates'] = array('AdminImportController', 'split');
                 $this->available_fields = array(
                     'no' => array('label' => $this->l('Ignore this column')),
-                    'room_num' => array('label' => $this->l('Stay No *'),),
+                    'room_num' => array('label' => $this->l('Room No *'),),
                     'floor' => array('label' => $this->l('Floor')),
                     'id_product' => array('label' => $this->l('Room Type ID *')),
                     'id_status' => array(
-                        'label' => $this->l('Stay status (1/2/3)'),
+                        'label' => $this->l('Room status (1/2/3)'),
                         'help' => $this->l('1 = Active, 2 = Inactive, 3 = Temporarily Inactive')),
                     'comment' => array('label' => $this->l('Extra Information')),
                     'dates' => array('label' => $this->l('Inactive date ranges and Reason(yyyy-mm-dd)'),
@@ -255,7 +255,7 @@ class AdminImportControllerCore extends AdminController
                     'id_tax_rules_group' => array('label' => $this->l('Tax rule ID')),
                     'auto_add_to_cart' => array('label' => $this->l('Auto add to cart (0 = No, 1 = Yes)')),
                     'price_addition_type' => array('label' => $this->l('Price display preference'),
-                        'help' => $this->l('1 = With stay price, 2 = As convenience fee')),
+                        'help' => $this->l('1 = With room price, 2 = As convenience fee')),
                     'show_at_front' => array('label' => $this->l('Show at front office (0 = No, 1 = Yes)')),
                     'price_calculation_method' => array('label' => $this->l('Price calculation method'),
                         'help' => $this->l('1 = Once per booking, 2 = Each day')),
@@ -300,7 +300,7 @@ class AdminImportControllerCore extends AdminController
                         'label' => $this->l('Duration * (yyyy-mm-dd)'),
                         'help' => $this->l('Check_in, Check_out')
                     ),
-                    'num_rooms' => array('label' => $this->l('Number Of Stays')),
+                    'num_rooms' => array('label' => $this->l('Number Of Rooms')),
                     'amount' => array('label' => $this->l('Order Price')),
                     'due_amount' => array('label' => $this->l('Due Amount')),
                     'id_currency' => array('label' => $this->l('Currency ID')),
@@ -3344,7 +3344,7 @@ class AdminImportControllerCore extends AdminController
                 if (!file_exists(_PS_PROD_IMG_DIR_)) {
                     mkdir(_PS_PROD_IMG_DIR_);
                 }
-            case $this->entities[$this->l('Stays')]:
+            case $this->entities[$this->l('Rooms')]:
                 Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_information`');
                 Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'htl_room_disable_dates`');
             break;
@@ -3470,7 +3470,7 @@ class AdminImportControllerCore extends AdminController
                         $this->roomTypeImport();
                         $this->clearSmartyCache();
                         break;
-                    case $this->entities[$import_type = $this->l('Stays')]:
+                    case $this->entities[$import_type = $this->l('Rooms')]:
                         $this->roomImport();
                         $this->clearSmartyCache();
                         break;
diff --git a/controllers/admin/AdminOrderPreferencesController.php b/controllers/admin/AdminOrderPreferencesController.php
index d16123ec9..5c6f73070 100644
--- a/controllers/admin/AdminOrderPreferencesController.php
+++ b/controllers/admin/AdminOrderPreferencesController.php
@@ -187,9 +187,9 @@ class AdminOrderPreferencesControllerCore extends AdminController
                         'cast' => 'intval'
                     ),
                     'PS_ROOM_PRICE_AUTO_ADD_BREAKDOWN' => array(
-                        'title' => $this->l('Show stay price breakdown'),
-                        'hint' => $this->l('Show price breakdown for stays with auto added services on checkout page.'),
-                        'desc' => $this->l('Displays a price breakdown for stays that have auto-added services during checkout.'),
+                        'title' => $this->l('Show room price breakdown'),
+                        'hint' => $this->l('Show price breakdown for rooms with auto added services on checkout page.'),
+                        'desc' => $this->l('Displays a price breakdown for rooms that have auto-added services during checkout.'),
                         'cast' => 'intval',
                         'type' => 'bool'
                     ),
@@ -311,8 +311,8 @@ class AdminOrderPreferencesControllerCore extends AdminController
                     ),
                     'PS_OVERBOOKING_AUTO_RESOLVE' => array(
                         'title' => $this->l('Resolve overbooking automatically'),
-                        'hint' => $this->l('Enable, if you want to resolve overbooking automatically when stays are available to be replaced with overbooked stays.'),
-                        'desc' => $this->l('If enabled, the overbookings in the order will be resolved automatically when stays are available to be replaced with all overbooked stays in the order.'),
+                        'hint' => $this->l('Enable, if you want to resolve overbooking automatically when rooms are available to be replaced with overbooked rooms.'),
+                        'desc' => $this->l('If enabled, the overbookings in the order will be resolved automatically when rooms are available to be replaced with all overbooked rooms in the order.'),
                         'validation' => 'isBool',
                         'cast' => 'intval',
                         'type' => 'bool'
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 6c1dbb94d..4dbea8f5f 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -188,7 +188,7 @@ class AdminOrdersControllerCore extends AdminController
                 'displayed' => false,
             ),
             'id_room_information' => array(
-                'title' => $this->l('Stays'),
+                'title' => $this->l('Rooms'),
                 'type' => 'select',
                 'filter_key' => 'hbd!id_room',
                 'list' => $this->roomsArray,
@@ -226,7 +226,7 @@ class AdminOrdersControllerCore extends AdminController
                 'havingFilter' => true,
             ),
             'num_rooms' => array(
-                'title' => $this->l('No. of stays'),
+                'title' => $this->l('No. of rooms'),
                 'align' => 'text-center',
                 'type' => 'range',
                 'optional' => true,
@@ -333,13 +333,13 @@ class AdminOrdersControllerCore extends AdminController
                 'optional' => true,
             ),
             'is_refunded' => array(
-                'title' => $this->l('Refunded / Cancelled Stays'),
+                'title' => $this->l('Refunded / Cancelled Rooms'),
                 'filter_key' => 'rrb!is_room_refunded',
                 'type'=>'bool',
                 'displayed' => false,
             ),
             'id_status' => array(
-                'title' => $this->l('Stay status'),
+                'title' => $this->l('Room status'),
                 'filter_key' => 'hbd!id_status',
                 'displayed' => false,
                 'type' => 'select',
@@ -378,8 +378,8 @@ class AdminOrdersControllerCore extends AdminController
 
         // overbooking success status
         $this->_conf[51] = $this->l('Overbooking is successfully resolved');
-        $this->_conf[52] = $this->l('Stay in the booking is successfully reallocated');
-        $this->_conf[53] = $this->l('Stay in the booking is successfully swapped');
+        $this->_conf[52] = $this->l('Room in the booking is successfully reallocated');
+        $this->_conf[53] = $this->l('Room in the booking is successfully swapped');
     }
 
     public static function setOrderCurrency($echo, $row)
@@ -971,7 +971,7 @@ class AdminOrdersControllerCore extends AdminController
             $modal = array(
                 'modal_id' => 'room-reallocation-modal',
                 'modal_class' => 'modal-md order_detail_modal',
-                'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Stay Reallocation / Swap'),
+                'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Room Reallocation / Swap'),
                 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_reallocation.tpl'),
                 'modal_actions' => null,
             );
@@ -1001,14 +1001,14 @@ class AdminOrdersControllerCore extends AdminController
             $modal = array(
                 'modal_id' => 'add-room-booking-modal',
                 'modal_class' => 'modal-md order_detail_modal',
-                'modal_title' => '<i class="icon icon-bed"></i> &nbsp'.$this->l('Add Stay'),
+                'modal_title' => '<i class="icon icon-bed"></i> &nbsp'.$this->l('Add Room'),
                 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_add_room_booking.tpl'),
                 'modal_actions' => array(
                     array(
                         'type' => 'button',
                         'value' => 'submitAddRoom',
                         'class' => 'submitAddRoom btn-primary pull-right',
-                        'label' => '<i class="icon-bed"></i> '.$this->l('Add Stay'),
+                        'label' => '<i class="icon-bed"></i> '.$this->l('Add Room'),
                     ),
                 ),
             );
@@ -1146,7 +1146,7 @@ class AdminOrdersControllerCore extends AdminController
                 $modal = array(
                     'modal_id' => 'edit-room-booking-modal',
                     'modal_class' => 'modal-lg order_detail_modal',
-                    'modal_title' => '<i class="icon icon-bed"></i> &nbsp'.$this->l('Edit Stay'),
+                    'modal_title' => '<i class="icon icon-bed"></i> &nbsp'.$this->l('Edit Room'),
                     'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_edit_room_booking.tpl'),
                 );
 
@@ -1590,7 +1590,7 @@ class AdminOrdersControllerCore extends AdminController
                     'title' => $this->l('Room Types')
                 ),
                 'rooms' => array(
-                    'title' => $this->l('Stays')
+                    'title' => $this->l('Rooms')
                 ),
                 'currency' => array(
                     'title' => $this->l('Currency')
@@ -1617,7 +1617,7 @@ class AdminOrdersControllerCore extends AdminController
                     'filter_key' => 'a!date_add',
                 ),
                 'room_status' => array(
-                    'title' => $this->l('Stay Status'),
+                    'title' => $this->l('Room Status'),
                 ),
                 'country' => array(
                     'title' => $this->l('Country'),
@@ -1671,7 +1671,7 @@ class AdminOrdersControllerCore extends AdminController
                     // check if room is from selected room type
                     if (Validate::isLoadedObject($objRoomInfo = new HotelRoomInformation($idRoomToReallocate))) {
                         if ($objRoomInfo->id_product != $idNewRoomType) {
-                            $this->errors[] = $this->l('Invalid stay selected for reallocation.');
+                            $this->errors[] = $this->l('Invalid room selected for reallocation.');
                         } elseif (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) {
                             $this->errors[] = $this->l('Invalid booking found for reallocation.');
                         } elseif (!$availableRooms = $objBookingDetail->getAvailableRoomsForReallocation(
@@ -1680,17 +1680,17 @@ class AdminOrdersControllerCore extends AdminController
                             $idNewRoomType,
                             $objHotelBooking->id_hotel
                         )) {
-                            $this->errors[] = $this->l('Selected stay is not available for reallocation.');
+                            $this->errors[] = $this->l('Selected room is not available for reallocation.');
                         } elseif (!in_array($idRoomToReallocate, array_column($availableRooms, 'id_room'))) {
-                            $this->errors[] = $this->l('Selected stay is not available for reallocation.');
+                            $this->errors[] = $this->l('Selected room is not available for reallocation.');
                         } elseif (!Validate::isFloat($priceDiff)) {
                             $this->errors[] = $this->l('Invalid price difference of the room types.');
                         }
                     } else {
-                        $this->errors[] = $this->l('Selected stay is not available for reallocation.');
+                        $this->errors[] = $this->l('Selected room is not available for reallocation.');
                     }
                 } else {
-                    $this->errors[] = $this->l('Please select a stay to reallocate with this stay.');
+                    $this->errors[] = $this->l('Please select a room to reallocate with this room.');
                 }
 
                 if (!count($this->errors)) {
@@ -1730,10 +1730,10 @@ class AdminOrdersControllerCore extends AdminController
                 $idHtlBookingToSwap = Tools::getValue('swap_avail_rooms');
 
                 if (!Validate::isLoadedObject($objHotelBooking = new HotelBookingDetail($idHtlBookingFrom))) {
-                    $this->errors[] = $this->l('Selected stay is not available to swap.');
+                    $this->errors[] = $this->l('Selected room is not available to swap.');
                 } else {
                     if (!Validate::isLoadedObject($objHotelBookingTo = new HotelBookingDetail($idHtlBookingToSwap))) {
-                        $this->errors[] = $this->l('Please select a stay to swap with this stay booking.');
+                        $this->errors[] = $this->l('Please select a room to swap with this room booking.');
                     } else {
                         if ($availableRooms = $objHotelBooking->getAvailableRoomsForSwapping(
                             $objHotelBooking->date_from,
@@ -1743,10 +1743,10 @@ class AdminOrdersControllerCore extends AdminController
                             $objHotelBooking->id_room
                         )) {
                             if (!in_array($idHtlBookingToSwap, array_column($availableRooms, 'id_hotel_booking'))) {
-                                $this->errors[] = $this->l('Selected stay is not available to swap.');
+                                $this->errors[] = $this->l('Selected room is not available to swap.');
                             }
                         } else {
-                            $this->errors[] = $this->l('Selected stay is not available to swap.');
+                            $this->errors[] = $this->l('Selected room is not available to swap.');
                         }
                     }
                 }
@@ -2998,8 +2998,8 @@ class AdminOrdersControllerCore extends AdminController
             $helper->id = 'box-total-rooms';
             $helper->icon = 'icon-home';
             $helper->color = 'color1';
-            $helper->title = $this->l('Total Stays');
-            $helper->tooltip = $this->l('Total stays is the number of stays booked in this order.');
+            $helper->title = $this->l('Total Rooms');
+            $helper->tooltip = $this->l('Total rooms is the number of rooms booked in this order.');
             $helper->href = '#start_products';
             $helper->value = $numRooms;
             $this->kpis[] = $helper;
@@ -3140,11 +3140,11 @@ class AdminOrdersControllerCore extends AdminController
             $helper->id = 'box-today-stay-over';
             $helper->icon = 'icon-user';
             $helper->color = 'color4';
-            $helper->title = $this->l('Occupied Stays', null, null, false);
+            $helper->title = $this->l('Occupied Rooms', null, null, false);
             $helper->subtitle = $this->l('Today', null, null, false);
             $helper->href = $this->context->link->getAdminLink('AdminOrders').'&submitResetorder&submitFilterorder=1&orderFilter_rrb!is_room_refunded=0&orderFilter_hbd!id_status='.HotelBookingDetail::STATUS_CHECKED_IN.'&orderFilter_hbd!date_to[]='.pSQL(date('Y-m-d', strtotime('+ 1 days'))).'&orderFilter_hbd!date_to[]=';
             $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=occupied_rooms';
-            $helper->tooltip = $this->l('The count of stays that are currently occupied by guests.', null, null, false);
+            $helper->tooltip = $this->l('The count of rooms that are currently occupied by guests.', null, null, false);
             $this->kpis[] = $helper;
 
             $helper = new HelperKpi();
@@ -3196,7 +3196,7 @@ class AdminOrdersControllerCore extends AdminController
             $helper->color = 'color4';
             $helper->title = $this->l('Average Lead Time', null, null, false);
             $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=average_lead_time';
-            $helper->tooltip = $this->l('Average number of days between the time guests book their stays and the time guest schedule to arrive at the hotel.', null, null, false);
+            $helper->tooltip = $this->l('Average number of days between the time guests book their rooms and the time guest schedule to arrive at the hotel.', null, null, false);
             $this->kpis[] = $helper;
 
             $helper = new HelperKpi();
diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php
index 14bc25cfd..cf87d2177 100644
--- a/controllers/admin/AdminPPreferencesController.php
+++ b/controllers/admin/AdminPPreferencesController.php
@@ -140,7 +140,7 @@ 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 stays, always all possible stays 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_FRONT_ROOM_UNIT_SELECTION_TYPE' => array(
                         'title' => $this->l('In front-end, add rooms to cart with'),
@@ -148,8 +148,8 @@ class AdminPPreferencesControllerCore extends AdminController
                         'cast' => 'intval',
                         'type' => 'select',
                         'list' => array(
-                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Stay Occupancy')),
-                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Stays Quantity (No. of stays)'))
+                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Room Occupancy')),
+                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Rooms Quantity (No. of rooms)'))
                         ),
                         'identifier' => 'id',
                     ),
@@ -175,16 +175,16 @@ 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 stays. For partially available stay, always all possible rooms will be displayed.'),
+                        'desc' => $this->l('This option is only for fully available rooms. For partially available room, always all possible rooms will be displayed.'),
                     ),
                     'PS_BACKOFFICE_ROOM_BOOKING_TYPE' => array(
-                        'title' => $this->l('In back-office, add stays to cart with'),
-                        'hint' => $this->l('In stay occupancy, while adding stay in cart customer has to select per stay occupancy and in room quantity customer only has to select number of rooms.'),
+                        '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.'),
                         'cast' => 'intval',
                         'type' => 'select',
                         'list' => array(
-                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Stay Occupancy')),
-                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Stays Quantity (No. of stays)'))
+                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_OCCUPANCY, 'name' => $this->l('Room Occupancy')),
+                            array('id' => HotelBookingDetail::PS_ROOM_UNIT_SELECTION_TYPE_QUANTITY, 'name' => $this->l('Rooms Quantity (No. of rooms)'))
                         ),
                         'identifier' => 'id',
                     ),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 55a093964..5bbe4af99 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -109,7 +109,7 @@ class AdminProductsControllerCore extends AdminController
             // 'Associations' => $this->l('Associations'),
             'Amenities' => $this->l('Amenities'),
             'Features' => $this->l('Features'),
-            'Configuration' => $this->l('Stays'),
+            'Configuration' => $this->l('Rooms'),
             'Occupancy' => $this->l('Occupancy'),
             'LengthOfStay' => $this->l('Length of Stay'),
         );
@@ -321,7 +321,7 @@ class AdminProductsControllerCore extends AdminController
         );
         // use it for total rooms
         $this->fields_list['num_rooms'] = array(
-            'title' => $this->l('Total Stays'),
+            'title' => $this->l('Total Rooms'),
             'align' => 'center',
             'type' => 'range',
             'havingFilter' => true,
@@ -2671,70 +2671,70 @@ class AdminProductsControllerCore extends AdminController
         $helper->id = 'box-total-rooms';
         $helper->icon = 'icon-bed';
         $helper->color = 'color3';
-        $helper->title = $this->l('Total Stays', null, null, false);
+        $helper->title = $this->l('Total Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=total_rooms';
-        $helper->tooltip = $this->l('The total number of stays in all hotels.', null, null, false);
+        $helper->tooltip = $this->l('The total number of rooms in all hotels.', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-occupied-rooms';
         $helper->icon = 'icon-user';
         $helper->color = 'color1';
-        $helper->title = $this->l('Occupied Stays', null, null, false);
+        $helper->title = $this->l('Occupied Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=occupied_rooms';
-        $helper->tooltip = $this->l('The count of stays that are currently occupied by guests.', null, null, false);
+        $helper->tooltip = $this->l('The count of rooms that are currently occupied by guests.', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-vacant-rooms';
         $helper->icon = 'icon-check-empty';
         $helper->color = 'color3';
-        $helper->title = $this->l('Vacant Stays', null, null, false);
+        $helper->title = $this->l('Vacant Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=vacant_rooms';
-        $helper->tooltip = $this->l('The count of stays that are either booked but currently unoccupied or available for booking', null, null, false);
+        $helper->tooltip = $this->l('The count of rooms that are either booked but currently unoccupied or available for booking', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-reserved-rooms';
         $helper->icon = 'icon-calendar';
         $helper->color = 'color4';
-        $helper->title = $this->l('Booked Stays', null, null, false);
+        $helper->title = $this->l('Booked Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=booked_rooms';
-        $helper->tooltip = $this->l('The total number of stays that are currently booked and awaiting guest check-in', null, null, false);
+        $helper->tooltip = $this->l('The total number of rooms that are currently booked and awaiting guest check-in', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-disabled-rooms';
         $helper->icon = 'icon-ban';
         $helper->color = 'color2';
-        $helper->title = $this->l('Disabled Stays', null, null, false);
+        $helper->title = $this->l('Disabled Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=disabled_rooms';
-        $helper->tooltip = $this->l('The total number of stays that are currently disabled.', null, null, false);
+        $helper->tooltip = $this->l('The total number of rooms that are currently disabled.', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-online-bookable-rooms';
         $helper->icon = 'icon-globe';
         $helper->color = 'color4';
-        $helper->title = $this->l('Online Bookable Stays', null, null, false);
+        $helper->title = $this->l('Online Bookable Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=online_bookable_rooms';
-        $helper->tooltip = $this->l('The total number of stays that can be booked directly from the front office.', null, null, false);
+        $helper->tooltip = $this->l('The total number of rooms that can be booked directly from the front office.', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
         $helper->id = 'box-offline-bookable-rooms';
         $helper->icon = 'icon-building';
         $helper->color = 'color1';
-        $helper->title = $this->l('Offline Bookable Stays', null, null, false);
+        $helper->title = $this->l('Offline Bookable Rooms', null, null, false);
         $helper->subtitle = $this->l('Today', null, null, false);
         $helper->source = $this->context->link->getAdminLink('AdminStats').'&ajax=1&action=getKpi&kpi=offline_bookable_rooms';
-        $helper->tooltip = $this->l('The total number of stays available for booking through the back office.', null, null, false);
+        $helper->tooltip = $this->l('The total number of rooms available for booking through the back office.', null, null, false);
         $this->kpis[] = $helper;
 
         $helper = new HelperKpi();
@@ -3209,7 +3209,7 @@ class AdminProductsControllerCore extends AdminController
                 $this->displayWarning($this->l('You must save the room type in this shop before managing hotel configuration.'));
             }
         } else {
-            $this->displayWarning($this->l('You must save this room type before managing stays.'));
+            $this->displayWarning($this->l('You must save this room type before managing rooms.'));
         }
 
         $this->tpl_form_vars['custom_form'] = $data->fetch();
@@ -3812,14 +3812,14 @@ class AdminProductsControllerCore extends AdminController
             $idRoom = Tools::getValue('id');
             $objRoomInfo = new HotelRoomInformation((int) $idRoom);
             if ($objRoomInfo->getFutureBookings($idRoom)) {
-                $this->errors[] = $this->l('This stay cannot be deleted as this stay contains future booking.');
+                $this->errors[] = $this->l('This room cannot be deleted as this room contains future booking.');
             }
             if (empty($this->errors)) {
                 $response['affected_rooms'] = HotelConnectedRoom::getTotalConnectedRooms(null, $idRoom);
                 if ($objRoomInfo->delete()) {
                     $response['success'] = true;
                 } else {
-                    $this->errors[] = $this->l('Unable to delete stay. Please try again!.');
+                    $this->errors[] = $this->l('Unable to delete room. Please try again!.');
                 }
             }
         }
@@ -5154,7 +5154,7 @@ class AdminProductsControllerCore extends AdminController
         $idProduct = Tools::getValue('id_product');
         if ($this->tabAccess['edit'] === 1) {
             if (!Validate::isDate($dateFrom) || !Validate::isDate($dateTo)) {
-                $this->errors[] = $this->l('Please select a valid date range to temporary disable this stay');
+                $this->errors[] = $this->l('Please select a valid date range to temporary disable this room');
             } else if ($idRoom && Validate::isLoadedObject($objHotelRoomInfo = new HotelRoomInformation((int) $idRoom))) {
                 $dateTo = date('Y-m-d', strtotime($dateTo));
                 $objHotelBookingDetail = new HotelBookingDetail();
diff --git a/mails/en/bookings_refund_request_detail_admin.tpl b/mails/en/bookings_refund_request_detail_admin.tpl
index 7c437554e..22975a761 100644
--- a/mails/en/bookings_refund_request_detail_admin.tpl
+++ b/mails/en/bookings_refund_request_detail_admin.tpl
@@ -2,7 +2,7 @@
     <table class="table table-recap room-booking-table">
         <thead>
             <tr>
-                <th colspan="9" class="table-caption">{l s='Stays Bookings Detail'}</th>
+                <th colspan="9" class="table-caption">{l s='Rooms Bookings Detail'}</th>
             </tr>
             <tr>
                 <th>{l s="Stay Num"}</th>
diff --git a/mails/en/bookings_refund_request_detail_customer.tpl b/mails/en/bookings_refund_request_detail_customer.tpl
index 6f6f70f03..3bdbb374a 100644
--- a/mails/en/bookings_refund_request_detail_customer.tpl
+++ b/mails/en/bookings_refund_request_detail_customer.tpl
@@ -2,7 +2,7 @@
     <table class="table table-recap room-booking-table">
         <thead>
             <tr>
-                <th colspan="9" class="table-caption">{l s='Stays Bookings Detail'}</th>
+                <th colspan="9" class="table-caption">{l s='Rooms Bookings Detail'}</th>
             </tr>
             <tr>
                 <th>{l s="Room Type"}</th>
diff --git a/mails/en/bookings_refund_request_detail_customer_text.tpl b/mails/en/bookings_refund_request_detail_customer_text.tpl
index 0b81bbaea..79e780802 100644
--- a/mails/en/bookings_refund_request_detail_customer_text.tpl
+++ b/mails/en/bookings_refund_request_detail_customer_text.tpl
@@ -1,6 +1,6 @@
 {if isset($list) && $list}
 
-{l s='Stays Bookings Detail'}
+{l s='Rooms Bookings Detail'}
 
 
 {l s="Room Type"}
diff --git a/mails/en/hotel_booking_cart_data.tpl b/mails/en/hotel_booking_cart_data.tpl
index f4e533aab..1d747e204 100644
--- a/mails/en/hotel_booking_cart_data.tpl
+++ b/mails/en/hotel_booking_cart_data.tpl
@@ -2,7 +2,7 @@
     <table class="table table-recap room-booking-table">
         <thead>
             <tr>
-                <th colspan="9" class="table-caption">{l s='Stays Booking Detail'}</th>
+                <th colspan="9" class="table-caption">{l s='Rooms Booking Detail'}</th>
             </tr>
             <tr>
                 <th>{l s="Stay Image"}</th>
diff --git a/mails/en/order_hotel_detail.tpl b/mails/en/order_hotel_detail.tpl
index fe8cebcc9..10d04d59c 100644
--- a/mails/en/order_hotel_detail.tpl
+++ b/mails/en/order_hotel_detail.tpl
@@ -7,7 +7,7 @@
             <span style="color:#333"><strong>{l s='Property Name'}:</strong></span> {$list['hotel_name']}<br />
             <span style="color:#333"><strong>{l s='Property Phone'}:</strong></span> {$list['hotel_phone']}<br />
             <span style="color:#333"><strong>{l s='Property Email'}:</strong></span> {$list['hotel_email']}<br />
-            <span style="color:#333"><strong>{l s='Total Stays'}:</strong></span> {$list['num_rooms']}<br />
+            <span style="color:#333"><strong>{l s='Total Rooms'}:</strong></span> {$list['num_rooms']}<br />
         </p>
     </div>
 {/if}
\ No newline at end of file
diff --git a/mails/en/order_hotel_detail_text.tpl b/mails/en/order_hotel_detail_text.tpl
index 7dc951483..f4e80043b 100644
--- a/mails/en/order_hotel_detail_text.tpl
+++ b/mails/en/order_hotel_detail_text.tpl
@@ -4,6 +4,6 @@
 {l s='Property Name'}: {$list['hotel_name']}
 {l s='Property Phone'}: {$list['hotel_phone']}
 {l s='Property Email'}: {$list['hotel_email']}
-{l s='Total Stays'}: {$list['num_rooms']}
+{l s='Total Rooms'}: {$list['num_rooms']}
 
 {/if}
\ No newline at end of file
diff --git a/mails/en/‎mails/en/booking_extra_services_text.tpl b/mails/en/‎mails/en/booking_extra_services_text.tpl
index 284861fe4..ac4a4f963 100644
--- a/mails/en/‎mails/en/booking_extra_services_text.tpl
+++ b/mails/en/‎mails/en/booking_extra_services_text.tpl
@@ -1,5 +1,5 @@
 {if isset($list) && $list}
-{l s='Stays Services Detail'}
+{l s='Rooms Services Detail'}
 
 {l s='Room Type'}
 {l s='Name'}
@@ -22,7 +22,7 @@
 {if $smarty.foreach.serviceRow.first}
 {$data_v['name']}
 {$rm_v['data_form']|date_format:"%d-%m-%Y"} {l s='to'} {$rm_v['data_to']|date_format:"%d-%m-%Y"}
-{l s='Stay'} - {$roomCount}
+{l s='Room'} - {$roomCount}
 {/if}
 
 {$service['name']}
@@ -43,6 +43,6 @@
 {/foreach}
 
 {if !isset($room_additinal_services_exists)}
-{l s='No stay services added.'}
+{l s='No room services added.'}
 {/if}
 {/if}
\ No newline at end of file
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 5e45a7299..1c0c78a7c 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -33,8 +33,8 @@
 				<a href="{$link->getPageLink($order_process, true)|escape:'html':'UTF-8'}" title="{l s='View my booking cart' mod='blockcart'}" rel="nofollow">
 					<!-- <b>{l s='Cart' mod='blockcart'}</b> -->
 					<span class="badge badge_style ajax_cart_quantity{if $cart_qties == 0} unvisible{/if}">{$total_products_in_cart}</span>
-					<!-- <span class="ajax_cart_product_txt{if $cart_qties != 1} unvisible{/if}">{l s='Stays' mod='blockcart'}</span> -->
-					<!-- <span class="ajax_cart_product_txt_s{if $cart_qties < 2} unvisible{/if}">{l s='Stays' mod='blockcart'}</span> -->
+					<!-- <span class="ajax_cart_product_txt{if $cart_qties != 1} unvisible{/if}">{l s='Rooms' mod='blockcart'}</span> -->
+					<!-- <span class="ajax_cart_product_txt_s{if $cart_qties < 2} unvisible{/if}">{l s='Rooms' mod='blockcart'}</span> -->
 					<span class="ajax_cart_total{if $cart_qties == 0} unvisible{/if}">
 						{if $cart_qties > 0}
 							{if $priceDisplay == 1}
@@ -138,7 +138,7 @@
 												{if $show_tax && $use_tax}
 													<div class="cart-prices-line">
 														<span class="price cart_block_tax_cost ajax_cart_tax_cost">{$tax_cost}</span>
-														<span>{l s='Stay and Service Tax' mod='blockcart'}</span>
+														<span>{l s='Room and Service Tax' mod='blockcart'}</span>
 													</div>
 												{/if}
 											{/block}
@@ -204,7 +204,7 @@
 							<span class="cross" title="{l s='Close window' mod='blockcart'}"></span>
 							{block name='blockcart_layer_cart_left_heading'}
 								<h2 class="layer_cart_room_txt">
-									<i class="icon-check"></i><span class="layer_cart_room_success_msg">{l s='Stay successfully added to your cart' mod='blockcart'}</span>
+									<i class="icon-check"></i><span class="layer_cart_room_success_msg">{l s='Room successfully added to your cart' mod='blockcart'}</span>
 								</h2>
 								<h2 class="layer_cart_product_txt">
 									<i class="icon-check"></i>{l s='Product successfully added to your cart' mod='blockcart'}
@@ -231,7 +231,7 @@
 										<span id="layer_cart_product_unit_price"></span>
 									</div>
 									<div>
-										<strong class="dark layer_cart_room_txt"><span class="layer_cart_attribute_type">{if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Stay occupancy' mod='blockcart'}{else}{l s='Stays quantity added' mod='blockcart'}{/if}</span> &nbsp;-&nbsp;</strong>
+										<strong class="dark layer_cart_room_txt"><span class="layer_cart_attribute_type">{if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}</span> &nbsp;-&nbsp;</strong>
 										<strong class="dark layer_cart_product_txt">{l s='Quantity' mod='blockcart'} &nbsp;-&nbsp;</strong>
 										<span id="layer_cart_product_quantity"></span>
 									</div>
@@ -263,7 +263,7 @@
 							{block name='blockcart_layer_cart_room_total_price'}
 								<div class="layer_cart_row">
 									<strong class="dark">
-										{l s='Total Stay Cost in cart' mod='blockcart'}
+										{l s='Total Room Cost in cart' mod='blockcart'}
 										{if $display_tax_label}
 											{if $priceDisplay == 1}
 												{l s='(tax excl.)' mod='blockcart'}
@@ -352,7 +352,7 @@
 							{block name='blockcart_layer_cart_total_tax'}
 								{if $show_tax && $use_tax}
 									<div class="layer_cart_row">
-										<strong class="dark">{l s='Stay and Service Tax' mod='blockcart'}</strong>
+										<strong class="dark">{l s='Room and Service Tax' mod='blockcart'}</strong>
 										<span class="price cart_block_tax_cost ajax_cart_tax_cost pull-right">{$tax_cost}</span>
 									</div>
 								{/if}
@@ -448,7 +448,7 @@
 		{addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL}
-		{addJsDefL name=remove_rm_title}{l s='Remove this stay from my cart' mod='blockcart' js=1}{/addJsDefL}
+		{addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=no_internet_txt}{l s='No internet. Please check your internet connection.' mod='blockcart' js=1}{/addJsDefL}
 
 		{addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')}
diff --git a/modules/blockcart/cartrow.tpl b/modules/blockcart/cartrow.tpl
index 8e7d37a7a..ce2b0d9e6 100644
--- a/modules/blockcart/cartrow.tpl
+++ b/modules/blockcart/cartrow.tpl
@@ -89,7 +89,7 @@
                                     </td>
                                     <td class="num_rooms_in_date">{$data_v['num_rm']}</td>
                                     <td>{convertPrice price=($data_v['amount'] + $data_v['additional_price'])}</td>
-                                    <td><a class="remove_rooms_from_cart_link" href="#" rm_price="{$data_v['amount']}" id_product="{$product.id_product|intval}" date_from="{$data_v['data_form']}" date_to="{$data_v['data_to']}" num_rooms="{$data_v['num_rm']}" title="{l s='remove this stay from my cart' mod='blockcart'}"></a></td>
+                                    <td><a class="remove_rooms_from_cart_link" href="#" rm_price="{$data_v['amount']}" id_product="{$product.id_product|intval}" date_from="{$data_v['data_form']}" date_to="{$data_v['data_to']}" num_rooms="{$data_v['num_rm']}" title="{l s='remove this room from my cart' mod='blockcart'}"></a></td>
                                 </tr>
                             {/foreach}
                         </tbody>
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index 2d3a2b7ca..d3f4ab9c4 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -238,7 +238,7 @@ class DashGuestCycle extends Module
     {
         $header = array(
             'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
-            'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
+            'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
             'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
             'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
             'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
@@ -298,7 +298,7 @@ class DashGuestCycle extends Module
     {
         $header = array(
             'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
-            'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
+            'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
             'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
             'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
             'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
@@ -358,7 +358,7 @@ class DashGuestCycle extends Module
     {
         $header = array(
             'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
-            'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
+            'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
             'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
             'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
             'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
@@ -425,7 +425,7 @@ class DashGuestCycle extends Module
             'order_id' => array('title' => $this->l('Order ID'), 'class' => 'text-center'),
             'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
             'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
-            'total' => array('title' => $this->l('Total Stays'), 'class' => 'text-center'),
+            'total' => array('title' => $this->l('Total Rooms'), 'class' => 'text-center'),
             'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
             'order_total' => array('title' => $this->l('Order Total'), 'class' => 'text-right'),
             'order_status' => array('title' => $this->l('Order Status'), 'class' => 'text-left'),
@@ -486,7 +486,7 @@ class DashGuestCycle extends Module
         $header = array(
             'request_id' => array('title' => $this->l('Request ID'), 'class' => 'text-center'),
             'name' => array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
-            'room_num' => array('title' => $this->l('Stay No.'), 'class' => 'text-center'),
+            'room_num' => array('title' => $this->l('Room No.'), 'class' => 'text-center'),
             'room_type' => array('title' => $this->l('Room Type'), 'class' => 'text-left'),
             'hotel' => array('title' => $this->l('Property'), 'class' => 'text-left'),
             'guests' => array('title' => $this->l('Guests'), 'class' => 'text-center'),
diff --git a/modules/dashinsights/dashinsights.php b/modules/dashinsights/dashinsights.php
index e9c99498c..511538204 100644
--- a/modules/dashinsights/dashinsights.php
+++ b/modules/dashinsights/dashinsights.php
@@ -60,7 +60,7 @@ class DashInsights extends Module
             Media::addJsDef(array(
                 'hotel_txt' => $this->l('Property'),
                 'nights_booked_txt' => $this->l('Nights Booked'),
-                'room_booked_txt' => $this->l('Stays Booked'),
+                'room_booked_txt' => $this->l('Rooms Booked'),
                 'length_of_stay_txt' => $this->l('Length Of Stay'),
                 'total_nights_booked_txt' => $this->l('Total Nights Booked'),
                 'date_txt' => $this->l('Date'),
@@ -145,13 +145,13 @@ class DashInsights extends Module
                     'chart_type' => 'multibar_chart_dotw_dashinsights',
                     'data' => $daysOfTheWeekData,
                     'date_format' => $this->context->language->date_format_lite,
-                    'axis_labels' => array('y' => $this->l('Stays occupied')),
+                    'axis_labels' => array('y' => $this->l('Rooms occupied')),
                 ),
                 'dashinsights_multibar_chart2' => array(
                 'chart_type' => 'multibar_chart_los_dashinsights',
                     'data' => $lengthOfStayData,
                     'date_format' => $this->context->language->date_format_lite,
-                    'axis_labels' => array('x' => $this->l('Length of stay'), 'y' => $this->l('Stays occupied')),
+                    'axis_labels' => array('x' => $this->l('Length of stay'), 'y' => $this->l('Rooms occupied')),
                 ),
             ),
         );
diff --git a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
index fdd5d9d9a..dcacf4754 100644
--- a/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
+++ b/modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
@@ -73,9 +73,9 @@
 					</div>
 				</div>
                 <div class="col-xs-6 col-lg-3">
-					<div class="stat-box label-tooltip" data-toggle="tooltip" data-original-title="{l s='Revenue Per Available Room (RevPAR) is calculated by dividing total stays revenue by the total number of rooms in the period being measured.' mod='dashperformance'}" data-placement="top" style="background-color: #B6FFB6;">
+					<div class="stat-box label-tooltip" data-toggle="tooltip" data-original-title="{l s='Revenue Per Available Room (RevPAR) is calculated by dividing total rooms revenue by the total number of rooms in the period being measured.' mod='dashperformance'}" data-placement="top" style="background-color: #B6FFB6;">
 						<div class="title-wrapper">
-							<p>{l s='Revenue Per Available Stay' mod='dashperformance'}</p>
+							<p>{l s='Revenue Per Available Room' mod='dashperformance'}</p>
 						</div>
 						<div class="value-wrapper">
 							<span id="dp_revenue_per_available_room" style="color: #00B200;">--</span>
@@ -85,7 +85,7 @@
 				<div class="col-xs-6 col-lg-3">
 					<div class="stat-box label-tooltip" data-toggle="tooltip" data-original-title="{l s='Total Revenue Per Available Room (TrevPAR) measures the total revenue being generated per available room including service products.' mod='dashperformance'}" data-placement="top" style="background-color: #EBCDFF;">
 						<div class="title-wrapper">
-							<p>{l s='Total Revenue Per Available Stay' mod='dashperformance'}</p>
+							<p>{l s='Total Revenue Per Available Room' mod='dashperformance'}</p>
 						</div>
 						<div class="value-wrapper">
 							<span id="dp_total_revenue_per_available_room" style="color: #FF4036;">--</span>
diff --git a/modules/dashproducts/dashproducts.php b/modules/dashproducts/dashproducts.php
index f84006114..9adb7f624 100644
--- a/modules/dashproducts/dashproducts.php
+++ b/modules/dashproducts/dashproducts.php
@@ -144,7 +144,7 @@ class DashProducts extends Module
 	{
 		$header = array(
 			array('title' => $this->l('Customer Name'), 'class' => 'text-left'),
-			array('title' => $this->l('Total Stays'), 'class' => 'text-left'),
+			array('title' => $this->l('Total Rooms'), 'class' => 'text-left'),
 			array('title' => $this->l('Order'), 'class' => 'text-left'),
 			array('title' => $this->l('Property'), 'class' => 'text-left'),
 			array('title' => $this->l('Total').' '.$this->l('Tax excl.'), 'class' => 'text-left'),
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index c7a3a5777..3f76c9e1b 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -43,8 +43,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
 
         parent::__construct();
 
-        $this->_conf[52] = $this->l('Stay in the booking is successfully reallocated');
-        $this->_conf[53] = $this->l('Stay in the booking is successfully swapped');
+        $this->_conf[52] = $this->l('Room in the booking is successfully reallocated');
+        $this->_conf[53] = $this->l('Room in the booking is successfully swapped');
 
         $this->eventColors = array(
             'available' => array('event' => '#7EC77B', 'cell' => '#D9EFD8'),
@@ -697,16 +697,16 @@ public function ajaxProcessGetCalenderData()
         if ($bookingData = $objBookingDetail->getBookingData($bookingParams)) {
             if ($bookingData['stats']['num_avail']) {
                 $eventColor = $this->eventColors['available']['event'];
-                $title = sprintf($this->l('%s Available Stays'), $bookingData['stats']['num_avail']);
+                $title = sprintf($this->l('%s Available Rooms'), $bookingData['stats']['num_avail']);
             } elseif ($bookingData['stats']['num_part_avai']) {
                 $eventColor = $this->eventColors['partially_available']['event'];
-                $title = sprintf($this->l('%s Partially Available Stays'), $bookingData['stats']['num_part_avai']);
+                $title = sprintf($this->l('%s Partially Available Rooms'), $bookingData['stats']['num_part_avai']);
             } elseif ($bookingData['stats']['num_booked'] == $bookingData['stats']['total_rooms'] && $bookingData['stats']['total_rooms'] != 0 && $bookingData['stats']['num_unavail'] == 0) {
                 $eventColor = $this->eventColors['booked']['event'];
-                $title = sprintf($this->l('%s Available Stays'), $bookingData['stats']['num_avail']);
+                $title = sprintf($this->l('%s Available Rooms'), $bookingData['stats']['num_avail']);
             } else {
                 $eventColor = $this->eventColors['unavailable']['event'];
-                $title = sprintf($this->l('%s Available Stays'), $bookingData['stats']['num_avail']);
+                $title = sprintf($this->l('%s Available Rooms'), $bookingData['stats']['num_avail']);
             }
             $bookingData['date_from_format'] = Tools::displayDate($searchDateFrom);
             $bookingData['date_to_format'] = Tools::displayDate($searchDateTo);
@@ -1069,7 +1069,7 @@ public function ajaxProcessGetCalenderData()
             $modal = array(
                 'modal_id' => 'room-reallocation-modal',
                 'modal_class' => 'modal-md order_detail_modal',
-                'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Stay Reallocation / Swap'),
+                'modal_title' => '<i class="icon icon-refresh"></i> &nbsp'.$this->l('Room Reallocation / Swap'),
                 'modal_content' => $this->context->smarty->fetch('controllers/orders/modals/_room_reallocation.tpl'),
                 'modal_actions' => null,
             );
@@ -1122,14 +1122,14 @@ public function ajaxProcessGetCalenderData()
             'add_to_cart' => $this->l('Add To Cart', null, true),
             'remove' => $this->l('Remove', null, true),
             'noRoomTypeAvlTxt' => $this->l('No room type available.', null, true),
-            'slct_rm_err' => $this->l('Please select a stay first.', null, true),
+            'slct_rm_err' => $this->l('Please select a room first.', null, true),
             'slct_rm_type_err' => $this->l('Please select a room type first.', null, true),
             'product_added_cart_txt' => $this->l('Product added in cart', null, true),
             'info_icon_path' => _MODULE_DIR_.$this->module->name.'/views/img/Slices/info-icon.svg',
             'select_age_txt' => $this->l('Select age', null, true),
             'under_1_age' => $this->l('Under 1', null, true),
-            'room_txt' => $this->l('Stay', null, true),
-            'rooms_txt' => $this->l('Stays', null, true),
+            'room_txt' => $this->l('Room', null, true),
+            'rooms_txt' => $this->l('Rooms', null, true),
             'remove_txt' => $this->l('Remove', null, true),
             'adult_txt' => $this->l('Adults', null, true),
             'adults_txt' => $this->l('Adults', null, true),
@@ -1138,7 +1138,7 @@ public function ajaxProcessGetCalenderData()
             'below_txt' => $this->l('Below', null, true),
             'years_txt' => $this->l('years', null, true),
             'all_children_txt' => $this->l('All Children', null, true),
-            'max_occupancy_reached_txt' => $this->l('Maximum stay occupancy reached', null, true),
+            'max_occupancy_reached_txt' => $this->l('Maximum room occupancy reached', null, true),
             'max_adults_txt' => $this->l('Maximum adult occupancy reached', null, true),
             'max_children_txt' => $this->l('Maximum children occupancy reached', null, true),
             'no_children_allowed_txt' => $this->l('Only adults can be accommodated', null, true),
@@ -1146,13 +1146,13 @@ public function ajaxProcessGetCalenderData()
             'PS_BACKDATE_ORDER_ALLOW' => $PS_BACKDATE_ORDER_ALLOW,
             // 'check_calender_var' => $check_calender_var,
             'txtSomeErr' => $this->l('Some error occurred. Please try again.', null, true),
-            'no_rm_avail_txt' => $this->l('No stay available.', null, true),
-            'no_realloc_rm_avail_txt' => $this->l('No stay available for reallocation.', null, true),
+            'no_rm_avail_txt' => $this->l('No room available.', null, true),
+            'no_realloc_rm_avail_txt' => $this->l('No room available for reallocation.', null, true),
             'no_realloc_rm_type_avail_txt' => $this->l('No room type available for reallocation.', null, true),
-            'no_swap_rm_avail_txt' => $this->l('No stay available for swap.', null, true),
-            'select_room_txt' => $this->l('Select stay', null, true),
-            'added_room_success_txt' => $this->l('Stay added to cart successfully', null, true),
-            'removed_room_success_txt' => $this->l('Stay removed from cart successfully', null, true),
+            'no_swap_rm_avail_txt' => $this->l('No room available for swap.', null, true),
+            'select_room_txt' => $this->l('Select room', null, true),
+            'added_room_success_txt' => $this->l('Room added to cart successfully', null, true),
+            'removed_room_success_txt' => $this->l('Room removed from cart successfully', null, true),
         );
         if (Configuration::get('PS_BACKOFFICE_SEARCH_TYPE') == HotelBookingDetail::SEARCH_TYPE_OWS ) {
             $jsVars['is_occupancy_wise_search'] = true;
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
index e82a8fcf3..a0fba2b45 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminOrderRefundRequestsController.php
@@ -104,7 +104,7 @@ class AdminOrderRefundRequestsController extends ModuleAdminController
 
             if ($refundReqBookings) {
                 $this->fields_list['num_rooms'] = array(
-                    'title' => $this->l('Total Stays'),
+                    'title' => $this->l('Total Rooms'),
                     'align' => 'center',
                     'havingFilter' => true,
                 );
diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-cart.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-cart.tpl
index 7a6cb95d1..5a91344d1 100644
--- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-cart.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/booking-cart.tpl
@@ -13,7 +13,7 @@
 							<table class="table table-responsive addtocart-table">
 								<thead class="cart-table-thead">
 									<tr>
-										<th class="text-center">{l s='Stay No.' mod='hotelreservationsystem'}</th>
+										<th class="text-center">{l s='Room No.' mod='hotelreservationsystem'}</th>
 										<th class="text-center">{l s='Room Type' mod='hotelreservationsystem'}</th>
 										<th class="text-center">{l s='Duration' mod='hotelreservationsystem'}</th>
 										<th class="text-center">{l s='Amount (Tax excl.)' mod='hotelreservationsystem'}</th>
@@ -70,7 +70,7 @@
 					<div class="row cart_amt_div">
 						<table class="table table-responsive">
 							<tr>
-								<td>{l s='Stays Amount (Tax excl.):' mod='hotelreservationsystem'}</td>
+								<td>{l s='Rooms Amount (Tax excl.):' mod='hotelreservationsystem'}</td>
 								<td class="text-right" id="cart_rooms_amount">
 									{if isset($cart_rooms_amount)}{convertPrice price=$cart_rooms_amount}{else}{convertPrice price=0}{/if}
 								</td>
diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/search-stats.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/search-stats.tpl
index f929dd4ff..11690bc24 100644
--- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/search-stats.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/_partials/search-stats.tpl
@@ -1,12 +1,12 @@
 <div class="htl_room_data_cont">
-    <div class="status-info-tooltip" title="{l s='Due to the dynamic nature of room availability, a single room can fall under multiple categories in the stats panel. For example, if a room is booked from 1st to 3th and then marked as unavailable for maintenance on 4th to 5th, it would be counted in both the "Booked Stays" and "Unavailable Stays" categories for those respective dates if search is done from 1st to 6th. This allows admin to understand the room\'s status across different periods accurately.' mod='hotelreservationsystem'}">
+    <div class="status-info-tooltip" title="{l s='Due to the dynamic nature of room availability, a single room can fall under multiple categories in the stats panel. For example, if a room is booked from 1st to 3th and then marked as unavailable for maintenance on 4th to 5th, it would be counted in both the "Booked Rooms" and "Unavailable Rooms" categories for those respective dates if search is done from 1st to 6th. This allows admin to understand the room\'s status across different periods accurately.' mod='hotelreservationsystem'}">
         <i class="icon-info-circle"></i>
     </div>
     <div class="row">
         <div class="col-sm-6">
             <div class="row">
                 <div class="col-sm-12 htl_room_cat_data">
-                    <p class="room_cat_header">{l s='Total Stays' mod='hotelreservationsystem'}</p>
+                    <p class="room_cat_header">{l s='Total Rooms' mod='hotelreservationsystem'}</p>
                     <p class="room_cat_data">{if isset($booking_data) && $booking_data}{$booking_data['stats']['total_rooms']|escape:'htmlall':'UTF-8'}{else}00{/if}</p>
                 </div>
             </div>
@@ -15,7 +15,7 @@
         <div class="col-sm-6">
             <div class="row">
                 <div class="col-sm-12 htl_room_cat_data">
-                    <p class="room_cat_header">{l s='Available Stays' mod='hotelreservationsystem'}</p>
+                    <p class="room_cat_header">{l s='Available Rooms' mod='hotelreservationsystem'}</p>
                     <p class="room_cat_data" id="num_avail">{if isset($booking_data) && $booking_data}{$booking_data['stats']['num_avail']|escape:'htmlall':'UTF-8'}{else}00{/if}</p>
                 </div>
             </div>
@@ -35,7 +35,7 @@
         <div class="col-sm-6">
             <div class="row">
                 <div class="col-sm-12 htl_room_cat_data">
-                    <p class="room_cat_header">{l s='Booked Stays' mod='hotelreservationsystem'}</p>
+                    <p class="room_cat_header">{l s='Booked Rooms' mod='hotelreservationsystem'}</p>
                     <p class="room_cat_data">{if isset($booking_data) && $booking_data}{$booking_data['stats']['num_booked']|escape:'htmlall':'UTF-8'}{else}00{/if}</p>
                 </div>
             </div>
@@ -47,7 +47,7 @@
         <div class="col-sm-6">
             <div class="row">
                 <div class="col-sm-12 htl_room_cat_data">
-                    <p class="room_cat_header">{l s='Unavailable Stays' mod='hotelreservationsystem'}</p>
+                    <p class="room_cat_header">{l s='Unavailable Rooms' mod='hotelreservationsystem'}</p>
                     <p class="room_cat_data">{if isset($booking_data) && $booking_data}{$booking_data['stats']['num_unavail']|escape:'htmlall':'UTF-8'}{else}00{/if}</p>
                 </div>
             </div>
@@ -56,7 +56,7 @@
         <div class="col-sm-6">
             <div class="row">
                 <div class="col-sm-12 htl_room_cat_data">
-                    <p class="room_cat_header">{l s='In-Cart Stays' mod='hotelreservationsystem'}</p>
+                    <p class="room_cat_header">{l s='In-Cart Rooms' mod='hotelreservationsystem'}</p>
                     <p class="room_cat_data" id="cart_stats">{if isset($booking_data) && $booking_data}{$booking_data['stats']['num_cart']|escape:'htmlall':'UTF-8'}{else}00{/if}</p>
                 </div>
             </div>
@@ -67,7 +67,7 @@
     <div class="row">
         <div class="col-sm-6 indi_cont clearfix">
             <span class="color_indicate bg-green"></span>
-            <span class="indi_label">{l s='Available Stays' mod='hotelreservationsystem'}</span>
+            <span class="indi_label">{l s='Available Rooms' mod='hotelreservationsystem'}</span>
         </div>
         <div class="col-sm-6 indi_cont clearfix">
             <span class="color_indicate bg-yellow"></span>
@@ -75,11 +75,11 @@
         </div>
         <div class="col-sm-6 indi_cont clearfix">
             <span class="color_indicate bg-red"></span>
-            <span class="indi_label">{l s='Unavailable Stays' mod='hotelreservationsystem'}</span>
+            <span class="indi_label">{l s='Unavailable Rooms' mod='hotelreservationsystem'}</span>
         </div>
         <div class="col-sm-6 indi_cont clearfix">
             <span class="color_indicate bg-blue"></span>
-            <span class="indi_label">{l s='Booked Stays' mod='hotelreservationsystem'}</span>
+            <span class="indi_label">{l s='Booked Rooms' mod='hotelreservationsystem'}</span>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl
index 047066e03..59e073aa1 100644
--- a/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl
@@ -75,7 +75,7 @@
 														<hr class="occupancy-info-separator col-sm-12">
 														{foreach from=$occupancy key=key item=$room_occupancy name=occupancyInfo}
 															<div class="occupancy_info_block" occ_block_index="{$key|escape:'htmlall':'UTF-8'}">
-																<div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Stay' mod='hotelreservationsystem'} - {$countRoom|escape:'htmlall':'UTF-8'} </label>{if !$smarty.foreach.occupancyInfo.first}<a class="remove-room-link pull-right" href="#">{l s='Remove' mod='hotelreservationsystem'}</a>{/if}</div>
+																<div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Room' mod='hotelreservationsystem'} - {$countRoom|escape:'htmlall':'UTF-8'} </label>{if !$smarty.foreach.occupancyInfo.first}<a class="remove-room-link pull-right" href="#">{l s='Remove' mod='hotelreservationsystem'}</a>{/if}</div>
 																<div class="col-sm-12">
 																	<div class="row">
 																		<div class="form-group col-xs-6 occupancy_count_block">
@@ -117,7 +117,7 @@
 														{/foreach}
 													{else}
 														<div class="occupancy_info_block col-sm-12" occ_block_index="0">
-															<div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Stay - 1' mod='hotelreservationsystem'}</label></div>
+															<div class="occupancy_info_head col-sm-12"><label class="room_num_wrapper">{l s='Room - 1' mod='hotelreservationsystem'}</label></div>
 															<div class="col-sm-12">
 																<div class="row">
 																	<div class="form-group col-xs-6 occupancy_count_block">
@@ -145,7 +145,7 @@
 													{/if}
 												</div>
 												<div class="add_occupancy_block col-sm-12">
-													<a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Stay' mod='hotelreservationsystem'}</span></a>
+													<a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Room' mod='hotelreservationsystem'}</span></a>
 												</div>
 											</div>
 										</div>
@@ -249,7 +249,7 @@
 		</div>
 		<div class="tip-body">
 			<div class="total_rooms">
-				<div class="tip_element_head">{l s='Total Stays' mod='hotelreservationsystem'}</div>
+				<div class="tip_element_head">{l s='Total Rooms' mod='hotelreservationsystem'}</div>
 				<div class="tip_element_value"></div>
 			</div>
 			<div class="num_avail">
@@ -257,15 +257,15 @@
 				<div class="tip_element_value"></div>
 			</div>
 			<div class="num_booked">
-				<div class="tip_element_head">{l s='Booked Stays' mod='hotelreservationsystem'}</div>
+				<div class="tip_element_head">{l s='Booked Rooms' mod='hotelreservationsystem'}</div>
 				<div class="tip_element_value"></div>
 			</div>
 			<div class="num_unavail">
-				<div class="tip_element_head">{l s='Unavailable Stays' mod='hotelreservationsystem'}</div>
+				<div class="tip_element_head">{l s='Unavailable Rooms' mod='hotelreservationsystem'}</div>
 				<div class="tip_element_value"></div>
 			</div>
             <div class="num_part_avai">
-				<div class="tip_element_head">{l s='Partially Available Stays' mod='hotelreservationsystem'}</div>
+				<div class="tip_element_head">{l s='Partially Available Rooms' mod='hotelreservationsystem'}</div>
 				<div class="tip_element_value"></div>
 			</div>
 		</div>
diff --git a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
index 3cc2dd2a1..8b7ebbf51 100644
--- a/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/order_refund_requests/helpers/view/view.tpl
@@ -84,7 +84,7 @@
                         {if isset($refundReqBookings) && $refundReqBookings}
                             <div class="form-group row">
                                 <div class="col-sm-3">
-                                    <strong>{l s='Total stays' mod='hotelreservationsystem'} :</strong>
+                                    <strong>{l s='Total rooms' mod='hotelreservationsystem'} :</strong>
                                 </div>
                                 <div class="col-sm-9">
                                     {$refundReqBookings|count}
@@ -153,14 +153,14 @@
 											{if !$isRefundCompleted}
 												<th></th>
 											{/if}
-											<th>{l s='Stay num' mod='hotelreservationsystem'}</th>
+											<th>{l s='Room num' mod='hotelreservationsystem'}</th>
 											<th>{l s='Room type' mod='hotelreservationsystem'}</th>
 											<th>{l s='Property' mod='hotelreservationsystem'}</th>
 											<th>{l s='Duration' mod='hotelreservationsystem'}</th>
 											<th>{l s='Total cost (tax incl.)' mod='hotelreservationsystem'}</th>
 											<th>{l s='Total paid amount (tax incl.)' mod='hotelreservationsystem'}</th>
 											{if !$isRefundCompleted}
-												<th>{l s='Stays cancelation charges' mod='hotelreservationsystem'}</th>
+												<th>{l s='Rooms cancelation charges' mod='hotelreservationsystem'}</th>
 											{/if}
 											<th>{l s='Refund amount' mod='hotelreservationsystem'}</th>
 
diff --git a/modules/statscheckup/statscheckup.php b/modules/statscheckup/statscheckup.php
index f65446750..d844af779 100644
--- a/modules/statscheckup/statscheckup.php
+++ b/modules/statscheckup/statscheckup.php
@@ -234,7 +234,7 @@ class StatsCheckUp extends Module
             'DESCRIPTIONS' => array('name' => $this->l('Descriptions'), 'text' => $this->l('chars (without HTML)')),
             'IMAGES' => array('name' => $this->l('Images'), 'text' => $this->l('images')),
             'ORDERS' => array('name' => $this->l('Orders'), 'text' => $this->l('orders / month')),
-            'TOTAL_ROOMS' => array('name' => $this->l('Total stays'), 'text' => $this->l('stays')),
+            'TOTAL_ROOMS' => array('name' => $this->l('Total rooms'), 'text' => $this->l('rooms')),
         );
 
         $hotelsHtml = '
@@ -309,7 +309,7 @@ class StatsCheckUp extends Module
         $hotelsHtml .= '
                     <th class="center"><span class="title_box active">'.$this->l('Images').'</span></th>
                     <th class="center"><span class="title_box active">'.$this->l('Orders').'</span></th>
-                    <th class="center"><span class="title_box active">'.$this->l('Total stays').'</span></th>
+                    <th class="center"><span class="title_box active">'.$this->l('Total rooms').'</span></th>
                     <th class="center"><span class="title_box active">'.$this->l('Overall status').'</span></th>
                     '.(!$this->id_hotel ? '<th class="center"><span class="title_box active">'.$this->l('Action').'</span></th>' : '').'
                 </tr>
@@ -415,7 +415,7 @@ class StatsCheckUp extends Module
         $hotelsHtml .= '
                     <th class="center"><span class="title_box active">'.$this->l('Images').'</span></th>
                     <th class="center"><span class="title_box active">'.$this->l('Orders').'</span></th>
-                    <th class="center"><span class="title_box active">'.$this->l('Total stays').'</span></th>
+                    <th class="center"><span class="title_box active">'.$this->l('Total rooms').'</span></th>
                     <th class="center"><span class="title_box active">'.$this->l('Overall status').'</span></th>
                     '.(!$this->id_hotel ? '<th></th>' : '').'
                 </tr>
diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php
index a8c634e12..1488c7a3f 100644
--- a/modules/statsproduct/statsproduct.php
+++ b/modules/statsproduct/statsproduct.php
@@ -308,7 +308,7 @@ class StatsProduct extends ModuleGraph
 							<span class="title_box active">'.$this->l('Room type name').'</span>
 						</th>
 						<th>
-							<span class="title_box text-center active">'.$this->l('Total stays').'</span>
+							<span class="title_box text-center active">'.$this->l('Total rooms').'</span>
 						</th>
 						<th>
 							<span class="title_box text-center active">'.$this->l('Action').'</span>
@@ -400,7 +400,7 @@ class StatsProduct extends ModuleGraph
             case 42:
                 $this->_titles['main'][0] = $this->l('ID');
                 $this->_titles['main'][1] = $this->l('Room type name');
-                $this->_titles['main'][2] = $this->l('Total Stays');
+                $this->_titles['main'][2] = $this->l('Total Rooms');
                 break;
         }
     }
diff --git a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
index bbc4f5292..d295347fe 100644
--- a/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
+++ b/modules/wkhotelroom/controllers/admin/AdminHotelRoomModuleSettingController.php
@@ -223,7 +223,7 @@ class AdminHotelRoomModuleSettingController extends ModuleAdminController
 
         $this->fields_form = array(
             'legend' => array(
-                'title' => $this->l('Stays Configuration'),
+                'title' => $this->l('Rooms Configuration'),
                 'icon' => 'icon-globe'
             ),
             'input' => array(
diff --git a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
index 36f5f6ec9..e0a1037a5 100644
--- a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
@@ -24,7 +24,7 @@
     {if isset($hotels_info) && count($hotels_info)}
         <div class="header-rmsearch-wrapper">
         <div class="filter_header clearfix">
-        <p>{l s='Search Stays' mod='wkroomsearchblock'}</p>
+        <p>{l s='Search Rooms' mod='wkroomsearchblock'}</p>
         <hr class="header-bottom-hr">
         </div>
         {block name='search_form'}
diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
index 0670412f8..26f90c9e8 100644
--- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
@@ -88,7 +88,7 @@
                         <div class="dropdown">
                             <button class="form-control input-occupancy header-rmsearch-input {if isset($error) && $error == 1}error_border{/if}" type="button" data-toggle="dropdown" id="guest_occupancy">
                                 <span class="pull-left">{if (isset($search_data['occupancy_adults']) && $search_data['occupancy_adults'])}{$search_data['occupancy_adults']} {if $search_data['occupancy_adults'] > 1}{l s='Adults' mod='wkroomsearchblock'}{else}{l s='Adult' mod='wkroomsearchblock'}{/if}, {if isset($search_data['occupancy_children']) && $search_data['occupancy_children']}{$search_data['occupancy_children']} {if $search_data['occupancy_children'] > 1}
-                                {l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Stays' mod='wkroomsearchblock'}{else}{l s='Stay' mod='wkroomsearchblock'}{/if}{else}{l s='1 Adult, 1 Stay' mod='wkroomsearchblock'}{/if}</span>
+                                {l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Rooms' mod='wkroomsearchblock'}{else}{l s='Room' mod='wkroomsearchblock'}{/if}{else}{l s='1 Adult, 1 Room' mod='wkroomsearchblock'}{/if}</span>
                             </button>
                             <div id="search_occupancy_wrapper" class="dropdown-menu">
                                 <div id="occupancy_inner_wrapper">
@@ -96,7 +96,7 @@
                                         {assign var=countRoom value=1}
                                         {foreach from=$search_data['occupancies'] key=key item=$occupancy name=occupancyInfo}
                                             <div class="occupancy-room-block">
-                                                <div class="occupancy_info_head"><span class="room_num_wrapper">{l s='Stay' mod='wkroomsearchblock'} - {$countRoom|escape:'htmlall':'UTF-8'} </span>{if !$smarty.foreach.occupancyInfo.first}<a class="remove-room-link pull-right" href="#">{l s='Remove' mod='wkroomsearchblock'}</a>{/if}</div>
+                                                <div class="occupancy_info_head"><span class="room_num_wrapper">{l s='Room' mod='wkroomsearchblock'} - {$countRoom|escape:'htmlall':'UTF-8'} </span>{if !$smarty.foreach.occupancyInfo.first}<a class="remove-room-link pull-right" href="#">{l s='Remove' mod='wkroomsearchblock'}</a>{/if}</div>
                                                 <div class="occupancy_info_block" occ_block_index="{$key|escape:'htmlall':'UTF-8'}">
                                                     <div class="row">
                                                         <div class="form-group occupancy_count_block col-sm-5 col-xs-6">
@@ -164,7 +164,7 @@
                                         {/foreach}
                                     {else}
                                         <div class="occupancy-room-block">
-                                            <div class="occupancy_info_head"><span class="room_num_wrapper">{l s='Stay - 1' mod='wkroomsearchblock'}</span></div>
+                                            <div class="occupancy_info_head"><span class="room_num_wrapper">{l s='Room - 1' mod='wkroomsearchblock'}</span></div>
                                             <div class="occupancy_info_block" occ_block_index="0">
                                                 <div class="row">
                                                     <div class="form-group occupancy_count_block col-sm-5 col-xs-6">
@@ -226,7 +226,7 @@
                                 </div>
                                 <div class="occupancy_block_actions">
                                     <span id="add_new_occupancy">
-                                        <a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Stay' mod='wkroomsearchblock'}</span></a>
+                                        <a class="add_new_occupancy_btn" href="#"><i class="icon-plus"></i> <span>{l s='Add Room' mod='wkroomsearchblock'}</span></a>
                                     </span>
                                     <span>
                                         <button class="submit_occupancy_btn btn btn-primary">{l s='Done' mod='wkroomsearchblock'}</button>
@@ -240,7 +240,7 @@
             {block name='search_form_submit'}
                 <div class="form-group grid-item search_room_submit_block area-4" style="grid-column: span 4;">
                     <button type="submit" class="btn btn btn-primary" name="search_room_submit" id="search_room_submit">
-                        <span>{l s='Search Stays' mod='wkroomsearchblock'}</span>
+                        <span>{l s='Search Rooms' mod='wkroomsearchblock'}</span>
                     </button>
                 </div>
             {/block}
diff --git a/modules/wkroomsearchblock/wkroomsearchblock.php b/modules/wkroomsearchblock/wkroomsearchblock.php
index a47a38ec2..42c7ce929 100644
--- a/modules/wkroomsearchblock/wkroomsearchblock.php
+++ b/modules/wkroomsearchblock/wkroomsearchblock.php
@@ -41,8 +41,8 @@ class WkRoomSearchBlock extends Module
         $this->bootstrap = true;
         parent::__construct();
 
-        $this->displayName = $this->l('QloApps Stay Search Panels');
-        $this->description = $this->l('Stay search blocks on different pages to search stays as per user travel parameters.');
+        $this->displayName = $this->l('QloApps Room Search Panels');
+        $this->description = $this->l('Room search blocks on different pages to search rooms as per user travel parameters.');
         $this->ps_versions_compliancy = array('min' => '1.6', 'max' => _PS_VERSION_);
     }
 
@@ -80,8 +80,8 @@ class WkRoomSearchBlock extends Module
                         'select_htl_txt' => $this->l('Select Property', false, true),
                         'select_age_txt' => $this->l('Select age', false, true),
                         'under_1_age' => $this->l('Under 1', false, true),
-                        'room_txt' => $this->l('Stay', false, true),
-                        'rooms_txt' => $this->l('Stays', false, true),
+                        'room_txt' => $this->l('Room', false, true),
+                        'rooms_txt' => $this->l('Rooms', false, true),
                         'remove_txt' => $this->l('Remove', false, true),
                         'adult_txt' => $this->l('Adult', false, true),
                         'adults_txt' => $this->l('Adults', false, true),
diff --git a/pdf/booking-voucher.tpl b/pdf/booking-voucher.tpl
index 36144f2d1..9ff85b2a5 100644
--- a/pdf/booking-voucher.tpl
+++ b/pdf/booking-voucher.tpl
@@ -257,7 +257,7 @@
                     </tr>
                     {if $footer.total_tax_without_discount > 0}
                         <tr>
-                            <td class="grey small bold" width="70%">{l s='Stay and Service Tax' pdf='true'}</td>
+                            <td class="grey small bold" width="70%">{l s='Room and Service Tax' pdf='true'}</td>
                             <td class="white right small bold" width="30%">{displayPrice currency=$order->id_currency price=$footer.total_tax_without_discount}</td>
                         </tr>
                     {/if}
diff --git a/pdf/invoice.additinal-services-tab.tpl b/pdf/invoice.additinal-services-tab.tpl
index f6f03c864..8cc48f80d 100644
--- a/pdf/invoice.additinal-services-tab.tpl
+++ b/pdf/invoice.additinal-services-tab.tpl
@@ -27,7 +27,7 @@
 	<table id="additional-services-table" class="bordered-table" width="100%" cellpadding="4" cellspacing="0">
 		<thead>
 			<tr>
-				<th colspan="5" class="header">{l s='Stay Extra Services Detail' pdf='true'}</th>
+				<th colspan="5" class="header">{l s='Room Extra Services Detail' pdf='true'}</th>
 			</tr>
 			<tr>
 				<th class="header-left small">{l s='Room Type' pdf='true'}</th>
@@ -47,7 +47,7 @@
                                 <td rowspan="{$htlBookingServices['additional_services']|count}">
                                     {$htlBookingServices['room_type_name']}<br>
                                     {dateFormat date=$htlBookingServices['date_from']} {l s='to' pdf='true'} {dateFormat date=$htlBookingServices['date_to']}<br>
-                                    <strong>{l s='Stay' pdf='true'} - {$roomCount}</strong>
+                                    <strong>{l s='Room' pdf='true'} - {$roomCount}</strong>
                                 </td>
                             {/if}
                             <td>
diff --git a/pdf/invoice.product-tab.tpl b/pdf/invoice.product-tab.tpl
index 8fb02e16e..d31799c1f 100644
--- a/pdf/invoice.product-tab.tpl
+++ b/pdf/invoice.product-tab.tpl
@@ -27,20 +27,20 @@
 	<table class="bordered-table" width="100%" cellpadding="4" cellspacing="0">
 		<thead>
 			<tr>
-				<th colspan="{if $display_product_images}8{else}7{/if}" class="header">{l s='Stays Details' pdf='true'}</th>
+				<th colspan="{if $display_product_images}8{else}7{/if}" class="header">{l s='Rooms Details' pdf='true'}</th>
 			</tr>
 			<tr>
 				{if $display_product_images}
-					<th class="product header small">{l s='Stay Image' pdf='true'}</th>
+					<th class="product header small">{l s='Room Image' pdf='true'}</th>
 				{/if}
-				<th class="product header small">{l s='Stay Description' pdf='true'}</th>
+				<th class="product header small">{l s='Room Description' pdf='true'}</th>
 				<th class="product header small">{l s='Tax Rate(s)' pdf='true'}</th>
 				{* {if isset($layout.before_discount)}
 					<th class="product header small">{l s='Base price' pdf='true'} <br /> {l s='(Tax excl.)' pdf='true'}</th>
 				{/if} *}
 
 				<th class="product header small">{l s='Unit Price' pdf='true'} <br /> {l s='(Tax excl.)' pdf='true'}</th>
-				<th class="product header small">{l s='Stays' pdf='true'}</th>
+				<th class="product header small">{l s='Rooms' pdf='true'}</th>
 				<th class="product header small">{l s='Check-in Date' pdf='true'}</th>
 				<th class="product header small">{l s='Check-out Date' pdf='true'}</th>
 				<th class="product header small">{l s='Total' pdf='true'} <br /> {l s='(Tax excl.)' pdf='true'}</th>
@@ -71,7 +71,7 @@
 							</td>
 							<td class="product center">
 								<p class="text-left">
-									{if $rm_v['adults'] <= 9}0{$rm_v['adults']}{else}{$rm_v['adults']}{/if} {if $rm_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v['children']}, {if $rm_v['children'] <= 9}0{$rm_v['children']}{else} {$rm_v['children']}{/if} {if $rm_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}<br>{if $rm_v['num_rm'] <= 9}0{/if}{$rm_v['num_rm']} {if $rm_v['num_rm'] > 1}{l s='Stays'}{else}{l s='Stay'}{/if}
+									{if $rm_v['adults'] <= 9}0{$rm_v['adults']}{else}{$rm_v['adults']}{/if} {if $rm_v['adults'] > 1}{l s='Adults'}{else}{l s='Adult'}{/if}{if $rm_v['children']}, {if $rm_v['children'] <= 9}0{$rm_v['children']}{else} {$rm_v['children']}{/if} {if $rm_v['children'] > 1}{l s='Children'}{else}{l s='Child'}{/if}{/if}<br>{if $rm_v['num_rm'] <= 9}0{/if}{$rm_v['num_rm']} {if $rm_v['num_rm'] > 1}{l s='Rooms'}{else}{l s='Room'}{/if}
 								</p>
 							</td>
 							<td class="product center">
diff --git a/pdf/invoice.tax-tab.tpl b/pdf/invoice.tax-tab.tpl
index f4abcc4ca..acf599a90 100644
--- a/pdf/invoice.tax-tab.tpl
+++ b/pdf/invoice.tax-tab.tpl
@@ -92,7 +92,7 @@
 							{if $label == 'additional_services_tax'}
 								{l s='Services' pdf='true'}
 							{elseif $label == 'room_tax'}
-								{l s='Stays' pdf='true'}
+								{l s='Rooms' pdf='true'}
 							{elseif $label == 'convenience_fee_tax'}
 								{l s='Convenience Fees' pdf='true'}
 							{elseif $label == 'service_products_tax'}
diff --git a/pdf/invoice.total-tab.tpl b/pdf/invoice.total-tab.tpl
index d62e58b0d..51f4a5455 100644
--- a/pdf/invoice.total-tab.tpl
+++ b/pdf/invoice.total-tab.tpl
@@ -27,7 +27,7 @@
 	{if isset($footer.room_price_tax_excl) && $footer.room_price_tax_excl}
 		<tr>
 			<td class="grey" width="70%">
-				{l s='Total Stays Cost (tax excl.)' pdf='true'}
+				{l s='Total Rooms Cost (tax excl.)' pdf='true'}
 			</td>
 			<td class="white" width="30%">
 				{displayPrice currency=$order->id_currency price=$footer.room_price_tax_excl}
@@ -67,7 +67,7 @@
 	{* {if isset($footer.product_taxes) && $footer.product_taxes}
 		<tr>
 			<td class="grey" width="70%">
-				{l s='Stays Tax' pdf='true'}
+				{l s='Rooms Tax' pdf='true'}
 			</td>
 			<td class="white" width="30%">
 				{displayPrice currency=$order->id_currency price=($footer.room_price_tax_incl - $footer.room_price_tax_excl)}
@@ -109,7 +109,7 @@
 	{if $footer.total_tax_without_discount > 0}
 	<tr class="bold">
 		<td class="grey">
-			{l s='Stay and Service Tax' pdf='true'}
+			{l s='Room and Service Tax' pdf='true'}
 		</td>
 		<td class="white">
 			{displayPrice currency=$order->id_currency price=$footer.total_tax_without_discount}
diff --git a/pdf/order-slip.product-tab.tpl b/pdf/order-slip.product-tab.tpl
index b0e382a29..4beb40cdf 100644
--- a/pdf/order-slip.product-tab.tpl
+++ b/pdf/order-slip.product-tab.tpl
@@ -27,13 +27,13 @@
     <table class="bordered-table" width="100%" cellpadding="4" cellspacing="0">
 		<thead>
             <tr>
-				<th colspan="5" class="header">{l s='Stay Bookings Detail' pdf='true'}</th>
+				<th colspan="5" class="header">{l s='Room Bookings Detail' pdf='true'}</th>
 			</tr>
 			<tr>
 				<th class="product header">{l s='Room Type / Reference' pdf='true'}</th>
                 <th class="product header">{l s='Property Name' pdf='true'}</th>
 				<th class="product header">{l s='Duration' pdf='true'}</th>
-				<th class="product header">{l s='Num stays' pdf='true'}</th>
+				<th class="product header">{l s='Num rooms' pdf='true'}</th>
 				<th class="product header-right">{l s='Total Price' pdf='true'}<br />{if $tax_excluded_display}{l s='(Tax Excl.)' pdf='true'}{else}{l s='(Tax Incl.)' pdf='true'}{/if}</th>
 			</tr>
 		</thead>
diff --git a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
index 71eee2055..e84dbb689 100644
--- a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
+++ b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
@@ -184,7 +184,7 @@
             {block name='occupancy_field_actions'}
                 <div class="occupancy_block_actions">
                     <span class="add_occupancy_block">
-                        <a class="add_new_occupancy_btn {if isset($occupancies) && $occupancies && isset($total_available_rooms) && $total_available_rooms <= count($occupancies)} disabled{/if}" data-title-available="{l s='Click to add more stays.'}" data-title-unavailable="{l s='No more stays available.'}" href="#">
+                        <a class="add_new_occupancy_btn {if isset($occupancies) && $occupancies && isset($total_available_rooms) && $total_available_rooms <= count($occupancies)} disabled{/if}" data-title-available="{l s='Click to add more rooms.'}" data-title-unavailable="{l s='No more rooms available.'}" href="#">
                             <i class="icon-plus"></i>
                             <span>{l s='Add'} {$room_type_info['selling_object_name']|escape:'html':'UTF-8'}</span>
                         </a>
diff --git a/themes/hotel-reservation-theme/_partials/room_type_list.tpl b/themes/hotel-reservation-theme/_partials/room_type_list.tpl
index 32983b678..e6d8288c4 100644
--- a/themes/hotel-reservation-theme/_partials/room_type_list.tpl
+++ b/themes/hotel-reservation-theme/_partials/room_type_list.tpl
@@ -158,7 +158,7 @@
 	{/foreach}
 {else}
 	<div class="noRoomsAvailAlert">
-		<span>{l s='No stay available for this property!'}</span>
+		<span>{l s='No room available for this property!'}</span>
 	</div>
 {/if}
 
diff --git a/themes/hotel-reservation-theme/cart-total-block.tpl b/themes/hotel-reservation-theme/cart-total-block.tpl
index ea6bd2641..485d32918 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 Stay cost'}
+                {l s='Total Room cost'}
                 {if $display_tax_label}
                     {if $use_taxes && $priceDisplay == 0}
                         {l s='(tax incl)'}
@@ -91,7 +91,7 @@
     {/block}
     {if $show_taxes}
         <p class="cart_total_tax">
-            <span>{l s='Stay and Service Tax'}</span>
+            <span>{l s='Room and Service Tax'}</span>
             <span class="cart_total_values">{displayPrice price=($total_tax_without_discount)}</span>
         </p>
     {/if}
diff --git a/themes/hotel-reservation-theme/global.tpl b/themes/hotel-reservation-theme/global.tpl
index 4a28b5c01..f8f62346a 100644
--- a/themes/hotel-reservation-theme/global.tpl
+++ b/themes/hotel-reservation-theme/global.tpl
@@ -64,15 +64,15 @@
 {addJsDef max_child_age=$max_child_age}
 {addJsDef hasDeliveryAddress=(isset($cart->id_address_delivery) && $cart->id_address_delivery)}
 
-{addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum stay occupancy reached' js=1}{/addJsDefL}
+{addJsDefL name='max_occupancy_reached_txt'}{l s='Maximum room occupancy reached' js=1}{/addJsDefL}
 {addJsDefL name='max_adults_txt'}{l s='Maximum adult occupancy reached' js=1}{/addJsDefL}
 {addJsDefL name='max_children_txt'}{l s='Maximum children occupancy reached' js=1}{/addJsDefL}
 {addJsDefL name='no_children_allowed_txt'}{l s='Only adults can be accommodated' js=1}{/addJsDefL}
 {addJsDefL name='select_occupancy_txt'}{l s='Select Occupancy' js=1}{/addJsDefL}
 {addJsDefL name='select_age_txt'}{l s='Select age' js=1}{/addJsDefL}
 {addJsDefL name='under_1_age'}{l s='Under 1' js=1}{/addJsDefL}
-{addJsDefL name='room_txt'}{l s='Stay' js=1}{/addJsDefL}
-{addJsDefL name='rooms_txt'}{l s='Stays' js=1}{/addJsDefL}
+{addJsDefL name='room_txt'}{l s='Room' js=1}{/addJsDefL}
+{addJsDefL name='rooms_txt'}{l s='Rooms' js=1}{/addJsDefL}
 {addJsDefL name='remove_txt'}{l s='Remove' js=1}{/addJsDefL}
 {addJsDefL name='adult_txt'}{l s='Adult' js=1}{/addJsDefL}
 {addJsDefL name='adults_txt'}{l s='Adults' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
index 3def897a4..4f73d6135 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
@@ -33,8 +33,8 @@
 				<a href="{$link->getPageLink($order_process, true)|escape:'html':'UTF-8'}" title="{l s='View my booking cart' mod='blockcart'}" rel="nofollow">
 					<!-- <b>{l s='Cart' mod='blockcart'}</b> -->
 					<span class="badge badge_style ajax_cart_quantity{if $cart_qties == 0} unvisible{/if}">{$total_products_in_cart}</span>
-					<!-- <span class="ajax_cart_product_txt{if $cart_qties != 1} unvisible{/if}">{l s='Stays' mod='blockcart'}</span> -->
-					<!-- <span class="ajax_cart_product_txt_s{if $cart_qties < 2} unvisible{/if}">{l s='Stays' mod='blockcart'}</span> -->
+					<!-- <span class="ajax_cart_product_txt{if $cart_qties != 1} unvisible{/if}">{l s='Rooms' mod='blockcart'}</span> -->
+					<!-- <span class="ajax_cart_product_txt_s{if $cart_qties < 2} unvisible{/if}">{l s='Rooms' mod='blockcart'}</span> -->
 					<span class="ajax_cart_total{if $cart_qties == 0} unvisible{/if}">
 						{if $cart_qties > 0}
 							{if $priceDisplay == 1}
@@ -138,7 +138,7 @@
 												{if $show_tax && $use_tax}
 													<div class="cart-prices-line">
 														<span class="price cart_block_tax_cost ajax_cart_tax_cost">{$tax_cost}</span>
-														<span>{l s='Stay and Service Tax' mod='blockcart'}</span>
+														<span>{l s='Room and Service Tax' mod='blockcart'}</span>
 													</div>
 												{/if}
 											{/block}
@@ -204,7 +204,7 @@
 							<span class="cross" title="{l s='Close window' mod='blockcart'}"></span>
 							{block name='blockcart_layer_cart_left_heading'}
 								<h2 class="layer_cart_room_txt">
-									<i class="icon-check"></i><span class="layer_cart_room_success_msg">{l s='Stay successfully added to your cart' mod='blockcart'}</span>
+									<i class="icon-check"></i><span class="layer_cart_room_success_msg">{l s='Room successfully added to your cart' mod='blockcart'}</span>
 								</h2>
 								<h2 class="layer_cart_product_txt">
 									<i class="icon-check"></i>{l s='Product successfully added to your cart' mod='blockcart'}
@@ -231,7 +231,7 @@
 										<span id="layer_cart_product_unit_price"></span>
 									</div>
 									<div>
-										<strong class="dark layer_cart_room_txt"><span class="layer_cart_attribute_type">{if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Stay occupancy' mod='blockcart'}{else}{l s='Stays quantity added' mod='blockcart'}{/if}</span> &nbsp;-&nbsp;</strong>
+										<strong class="dark layer_cart_room_txt"><span class="layer_cart_attribute_type">{if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}{l s='Room occupancy' mod='blockcart'}{else}{l s='Rooms quantity added' mod='blockcart'}{/if}</span> &nbsp;-&nbsp;</strong>
 										<strong class="dark layer_cart_product_txt">{l s='Quantity' mod='blockcart'} &nbsp;-&nbsp;</strong>
 										<span id="layer_cart_product_quantity"></span>
 									</div>
@@ -263,7 +263,7 @@
 							{block name='blockcart_layer_cart_room_total_price'}
 								<div class="layer_cart_row">
 									<strong class="dark">
-										{l s='Total Stay Cost in cart' mod='blockcart'}
+										{l s='Total Room Cost in cart' mod='blockcart'}
 										{if $display_tax_label}
 											{if $priceDisplay == 1}
 												{l s='(tax excl.)' mod='blockcart'}
@@ -352,7 +352,7 @@
 							{block name='blockcart_layer_cart_total_tax'}
 								{if $show_tax && $use_tax}
 									<div class="layer_cart_row">
-										<strong class="dark">{l s='Stay and Service Tax' mod='blockcart'}</strong>
+										<strong class="dark">{l s='Room and Service Tax' mod='blockcart'}</strong>
 										<span class="price cart_block_tax_cost ajax_cart_tax_cost pull-right">{$tax_cost}</span>
 									</div>
 								{/if}
@@ -450,7 +450,7 @@
 		{addJsDefL name=qty_txt}{l s='Qty' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=duration_txt}{l s='Duration' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=capacity_txt}{l s='Capacity' mod='blockcart' js=1}{/addJsDefL}
-		{addJsDefL name=remove_rm_title}{l s='Remove this stay from my cart' mod='blockcart' js=1}{/addJsDefL}
+		{addJsDefL name=remove_rm_title}{l s='Remove this room from my cart' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=no_internet_txt}{l s='No internet. Please check your internet connection.' mod='blockcart' js=1}{/addJsDefL}
 
 		{addJsDef rm_avail_process_lnk = $link->getModuleLink('blockcart', 'checkroomavailabilityajaxprocess')}
diff --git a/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl b/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
index 8e7d37a7a..ce2b0d9e6 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
@@ -89,7 +89,7 @@
                                     </td>
                                     <td class="num_rooms_in_date">{$data_v['num_rm']}</td>
                                     <td>{convertPrice price=($data_v['amount'] + $data_v['additional_price'])}</td>
-                                    <td><a class="remove_rooms_from_cart_link" href="#" rm_price="{$data_v['amount']}" id_product="{$product.id_product|intval}" date_from="{$data_v['data_form']}" date_to="{$data_v['data_to']}" num_rooms="{$data_v['num_rm']}" title="{l s='remove this stay from my cart' mod='blockcart'}"></a></td>
+                                    <td><a class="remove_rooms_from_cart_link" href="#" rm_price="{$data_v['amount']}" id_product="{$product.id_product|intval}" date_from="{$data_v['data_form']}" date_to="{$data_v['data_to']}" num_rooms="{$data_v['num_rm']}" title="{l s='remove this room from my cart' mod='blockcart'}"></a></td>
                                 </tr>
                             {/foreach}
                         </tbody>
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
index 7caf82b49..cc2a6b413 100644
--- a/themes/hotel-reservation-theme/order-confirmation.tpl
+++ b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -64,7 +64,7 @@
 				{if $any_back_order}
 					{if $shw_bo_msg}
 						<br>
-						<p class="back_o_msg"><strong><sup>*</sup>{l s='Some of your stays are on back order. Please read the following message for stays with status on backorder'}</strong></p>
+						<p class="back_o_msg"><strong><sup>*</sup>{l s='Some of your rooms are on back order. Please read the following message for rooms with status on backorder'}</strong></p>
 						<p>
 							-&nbsp;&nbsp;{$back_ord_msg}
 						</p>
@@ -76,7 +76,7 @@
 							<div class="col-md-8 order-product-summary">
 								{if isset($cart_htl_data)}
 									<div class="card">
-										<div class="card-header">{l s='Stay Details'}</div>
+										<div class="card-header">{l s='Room Details'}</div>
 										<div class="card-body">
 											{foreach from=$cart_htl_data key=data_k item=data_v}
 												{foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
@@ -424,7 +424,7 @@
 														{if isset($cart_htl_data)}
 															<tr class="item">
 																<td>
-																	<strong>{l s='Total Stay 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 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>
 																</td>
 																<td class="text-right">
 																	{if $priceDisplay && $use_tax}
@@ -475,7 +475,7 @@
 														{/if}
 														<tr class="item">
 															<td>
-																<strong>{l s='Stay and Service Tax'}</strong>
+																<strong>{l s='Room and Service Tax'}</strong>
 															</td>
 															<td class="text-right">
 																<span class="price-discount">{displayWtPriceWithCurrency price=$orderTotalInfo['total_tax_without_discount'] currency=$objOrderCurrency convert=1}</span>
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index e6ddbdabd..74ee88180 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -227,7 +227,7 @@
                 {block name='order_detail_refund_requests'}
                     {if (isset($refundReqBookings) && $refundReqBookings) || (isset($refundReqProducts) && $refundReqProducts)}
                         <div class="alert alert-info-light cancel_requests_link_wrapper">
-                            <i class="icon-info-circle"></i> <span>{l s='Your cancellation request for'} {if (isset($refundReqBookings) && $refundReqBookings) && (isset($refundReqProducts) && $refundReqProducts)}{l s='%d stay(s) and %d product(s)' sprintf=[count($refundReqBookings), count($refundReqProducts)]}{elseif isset($refundReqBookings) && $refundReqBookings}{l s='%d stay(s)' sprintf=[count($refundReqBookings)]}{elseif isset($refundReqProducts) && $refundReqProducts}{l s='%d product(s)' sprintf=[count($refundReqProducts)]}{/if} {l s='is being processed. To check request status' sprintf=[count($refundReqBookings)]} <a target="_blank" href="{$link->getPageLink('order-follow')|escape:'html':'UTF-8'}?id_order={$order->id|escape:'html':'UTF-8'}">{l s='click here.'}</a>
+                            <i class="icon-info-circle"></i> <span>{l s='Your cancellation request for'} {if (isset($refundReqBookings) && $refundReqBookings) && (isset($refundReqProducts) && $refundReqProducts)}{l s='%d room(s) and %d product(s)' sprintf=[count($refundReqBookings), count($refundReqProducts)]}{elseif isset($refundReqBookings) && $refundReqBookings}{l s='%d room(s)' sprintf=[count($refundReqBookings)]}{elseif isset($refundReqProducts) && $refundReqProducts}{l s='%d product(s)' sprintf=[count($refundReqProducts)]}{/if} {l s='is being processed. To check request status' sprintf=[count($refundReqBookings)]} <a target="_blank" href="{$link->getPageLink('order-follow')|escape:'html':'UTF-8'}?id_order={$order->id|escape:'html':'UTF-8'}">{l s='click here.'}</a>
                         </div>
                     {/if}
                 {/block}
@@ -240,7 +240,7 @@
                     {if isset($cart_htl_data) && $cart_htl_data}
                         <div class="card room-details">
                             <div class="card-header">
-                                {l s='Stay Details'}
+                                {l s='Room Details'}
                             </div>
                             <div class="card-body">
                                 {if isset($cart_htl_data) && $cart_htl_data}
@@ -258,7 +258,7 @@
                                         {/block}
                                     </div>
                                 {else}
-                                    <div class="no-stays card-text">{l s='Stay details not available.'}</div>
+                                    <div class="no-stays card-text">{l s='Room details not available.'}</div>
                                 {/if}
                             </div>
                         </div>
@@ -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 Stay 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 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 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>
@@ -374,7 +374,7 @@
                                         {/if}
 
                                         <tr class="totalprice item">
-                                            <td>{l s='Stay and Service Tax'}</td>
+                                            <td>{l s='Room and Service Tax'}</td>
                                             <td class="text-right">
                                                 <span class="price">{displayWtPriceWithCurrency price=($total_tax_without_discount) currency=$currency}</span>
                                             </td>
@@ -765,7 +765,7 @@
 
                                         {if isset($cart_htl_data) && $cart_htl_data}
                                             <tr>
-                                                <td>{l s='Total Stay 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 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 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>
@@ -802,7 +802,7 @@
                                         {/if}
 
                                         <tr class="totalprice item">
-                                            <td>{l s='Stay and Service Tax'}</td>
+                                            <td>{l s='Room and Service Tax'}</td>
                                             <td class="text-right">
                                                 <span class="price">{displayWtPriceWithCurrency price=($total_tax_without_discount) currency=$currency}</span>
                                             </td>
@@ -1156,7 +1156,7 @@
             {addJsDefL name=pending_state_msg}{l s='Pending...' js=1}{/addJsDefL}
             {addJsDefL name=mail_sending_err}{l s='Some error occurred while sending mail to the customer' js=1}{/addJsDefL}
             {addJsDefL name=refund_request_sending_error}{l s='Some error occurred while processing request for booking cancellation.' js=1}{/addJsDefL}
-            {addJsDefL name=no_bookings_selected}{l s='Please select at least one stay to proceed for cancellation.' js=1}{/addJsDefL}
+            {addJsDefL name=no_bookings_selected}{l s='Please select at least one room to proceed for cancellation.' js=1}{/addJsDefL}
             {addJsDefL name=refund_request_success_txt}{l s='Request for booking cancellation is successffully created.' js=1}{/addJsDefL}
             {addJsDefL name=order_message_choose_txt}{l s='-- Choose --' js=1}{/addJsDefL}
             {addJsDefL name=order_message_success_txt}{l s='Order message sent successfully.' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/order-follow.tpl b/themes/hotel-reservation-theme/order-follow.tpl
index ff79272f9..2fbe89e60 100644
--- a/themes/hotel-reservation-theme/order-follow.tpl
+++ b/themes/hotel-reservation-theme/order-follow.tpl
@@ -48,7 +48,7 @@
 						<tr>
 							<th>{l s='Order'}</th>
 							{if isset($hasRoomRefunds) && $hasRoomRefunds}
-                                <th>{l s='Total stays'}</th>
+                                <th>{l s='Total rooms'}</th>
                             {/if}
                             {if isset($hasProductRefunds) && $hasProductRefunds}
                                 <th>{l s='Total products'}</th>
diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl
index 63aad9844..03bc35fd6 100644
--- a/themes/hotel-reservation-theme/order-opc.tpl
+++ b/themes/hotel-reservation-theme/order-opc.tpl
@@ -340,7 +340,7 @@
 								{include file="$tpl_dir./errors.tpl"}
 							{/block}
 
-							<p class="alert alert-warning">{l s='You have not added any stays or products to your cart yet.'}</p>
+							<p class="alert alert-warning">{l s='You have not added any rooms or products to your cart yet.'}</p>
 						{/if}
 						{block name='order_opc_js_vars'}
 							{strip}
diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl
index d8ad68846..81b6ccef0 100644
--- a/themes/hotel-reservation-theme/order-return.tpl
+++ b/themes/hotel-reservation-theme/order-return.tpl
@@ -54,16 +54,16 @@
 		{block name='order_return_detail'}
 			{if $refundReqBookings}
                 {if isset($refundReqProducts) && $refundReqProducts}
-                    <h1 class="page-subheading">{l s='Stays refund requests'}</h1>
+                    <h1 class="page-subheading">{l s='Rooms refund requests'}</h1>
                 {/if}
 				<div class="table-responsive wk-datatable-wrapper">
 					<table class="table table-bordered">
 						<tr>
-							<th>{l s='Stays'}</th>
+							<th>{l s='Rooms'}</th>
 							<th>{l s='Room type'}</th>
 							<th>{l s='Property Name'}</th>
 							<th>{l s='Duration'}</th>
-							<th>{l s='Total stays price (tax incl.)'}</th>
+							<th>{l s='Total rooms price (tax incl.)'}</th>
 							<th>{l s='Extra services price (tax incl.)'}</th>
 							{if $isRefundCompleted}
 								<th>{l s='Refund amount'}</th>
@@ -72,7 +72,7 @@
 						</tr>
 						{foreach from=$refundReqBookings item=$booking name=refundRequest}
 							<tr>
-								<td>{l s='Stay'} - {$smarty.foreach.refundRequest.iteration|string_format:'%02d'}</td>
+								<td>{l s='Room'} - {$smarty.foreach.refundRequest.iteration|string_format:'%02d'}</td>
 								<td>{$booking['room_type_name']|escape:'htmlall':'UTF-8'}</td>
 								<td>{$booking['hotel_name']|escape:'htmlall':'UTF-8'}</td>
 								{assign var="is_full_date" value=($show_full_date && ($booking['date_from']|date_format:'%D' == $booking['date_to']|date_format:'%D'))}
diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl
index 36da4099f..b0bf0d8e6 100644
--- a/themes/hotel-reservation-theme/product.tpl
+++ b/themes/hotel-reservation-theme/product.tpl
@@ -392,7 +392,7 @@
 													{/block}
 													<!-- <div class="info_margin_div">
 														<div class="room_info_heading">
-															<span>{l s='Stays'}</span>
+															<span>{l s='Rooms'}</span>
 														</div>
 														<div class="room_info_content row"></div>
 													</div> -->
@@ -750,7 +750,7 @@
 		{else}
 			<div class="bootstrap">
 				<div class="alert alert-warning">
-					{l s='This room type has not enough information. Please save information of related hotel and other required stay information for the booking of this room type.'}
+					{l s='This room type has not enough information. Please save information of related hotel and other required room information for the booking of this room type.'}
 				</div>
 			</div>
 		{/if}
@@ -868,8 +868,8 @@
 			{addJsDef currency_blank = $currency->blank}
 			{addJsDefL name=correct_date_cond}{l s='Check Out Date should be greater than Check in date.' js=1}{/addJsDefL}
 			{addJsDefL name=some_error_cond}{l s='Some error occured .Please try again.' js=1}{/addJsDefL}
-			{addJsDefL name=unavail_qty_text}{l s='Required quantity of stays are Not available.' js=1}{/addJsDefL}
-			{addJsDefL name=out_of_stock_cond}{l s='No stay is available for this period.' js=1}{/addJsDefL}
+			{addJsDefL name=unavail_qty_text}{l s='Required quantity of rooms are Not available.' js=1}{/addJsDefL}
+			{addJsDefL name=out_of_stock_cond}{l s='No room is available for this period.' js=1}{/addJsDefL}
 			{addJsDefL name=wrong_qty_cond}{l s='you are trying for a invalid quantity.' js=1}{/addJsDefL}
 			{addJsDefL name=select_txt}{l s='Select' js=1}{/addJsDefL}
 			{addJsDefL name=remove_txt}{l s='Remove' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/shopping-cart-detail.tpl b/themes/hotel-reservation-theme/shopping-cart-detail.tpl
index 8c2a0057b..9fddafca9 100644
--- a/themes/hotel-reservation-theme/shopping-cart-detail.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart-detail.tpl
@@ -23,7 +23,7 @@
 <div class="order-detail-content">
     {if isset($cart_htl_data) && $cart_htl_data}
         {block name='shopping_cart_heading'}
-            <p class="cart_section_title">{l s='stays information'}</p>
+            <p class="cart_section_title">{l s='rooms information'}</p>
         {/block}
         {foreach from=$cart_htl_data key=data_k item=data_v}
             {foreach from=$data_v['date_diff'] key=rm_k item=rm_v}
@@ -143,7 +143,7 @@
                                                             </span>
                                                             <div class="room-price-detail-container" style="display: none;">
                                                                 <div class="room-price-detail-tooltip-cont">
-                                                                    <div><label>{l s='Stay price'}</label> : {displayPrice price=($rm_v['amount_without_auto_add'])}</div>
+                                                                    <div><label>{l s='Room price'}</label> : {displayPrice price=($rm_v['amount_without_auto_add'])}</div>
                                                                     <div><label>{l s='Additional charges'}</label> : {displayPrice price=($rm_v['amount'] - $rm_v['amount_without_auto_add'])}</div>
                                                                 </div>
                                                             </div>