diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 3aba5c8cc..944c3ba68 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -344,7 +344,7 @@
 								</h2>
 							{/block}
 
-							{block name='blockcart_layer_cart_total_price'}
+							{block name='blockcart_layer_cart_total_room_price'}
 								<div class="layer_cart_row">
 									<strong class="dark">
 										{l s='Total Rooms Cost in cart' mod='blockcart'}
@@ -501,4 +501,4 @@
 	{* ###################################################################
 	End
 	################################################################### *}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
index 14126f09c..46b5e2d6c 100644
--- a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
+++ b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
@@ -83,4 +83,4 @@
 			{addJsDefL name=bookNowTxt}{l s='Book Now' js=1 mod='wkhotelfilterblock'}{/addJsDefL}
 		{/strip}
 	{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
index 1879a2b64..a46f54eb5 100644
--- a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
@@ -27,4 +27,4 @@
 		{include file="./searchForm.tpl"}
         </div>
     {/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
index 32c54f255..75edfaf85 100644
--- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
@@ -19,7 +19,7 @@
 
 {block name='search_form'}
     <form method="POST" id="search_hotel_block_form" class="grid">
-        {block name='search_form_location_search_field'}
+        {block name='search_form_location'}
             {if isset($location_enabled) && $location_enabled}
                 <div class="form-group area-{$column_widths['location']}">
                     <input type="text" class="form-control header-rmsearch-input input-location" id="hotel_location" name="hotel_location" autocomplete="off" placeholder="{l s='Hotel Location' mod='wkroomsearchblock'}" {if isset($search_data)}value="{$search_data['location']|escape:'htmlall':'UTF-8'}"{/if}>
@@ -30,7 +30,7 @@
                 </div>
             {/if}
         {/block}
-        {block name='search_form_hotel_search_field'}
+        {block name='search_form_hotel'}
             {if count($hotels_info) <= 1 && !$show_hotel_name}
                 <input type="hidden" id="max_order_date" name="max_order_date" value="{if isset($hotels_info[0]['max_order_date'])}{$hotels_info[0]['max_order_date']|escape:'htmlall':'UTF-8'}{/if}">
                 <input type="hidden" id="preparation_time" name="preparation_time" value="{if isset($hotels_info[0]['preparation_time'])}{$hotels_info[0]['preparation_time']|escape:'htmlall':'UTF-8'}{/if}">
@@ -56,7 +56,7 @@
             {/if}
         {/block}
 
-        {block name='search_form_dates_search_field'}
+        {block name='search_form_dates'}
             {if isset($multiple_dates_input) && $multiple_dates_input}
                 <div class="grid area-{$column_widths['date']}" id="daterange_value">
                     <div class="form-group">
@@ -77,7 +77,7 @@
             {/if}
         {/block}
 
-        {block name='search_form_occupancy_search_field'}
+        {block name='search_form_occupancy'}
             {if isset($is_occupancy_wise_search) && $is_occupancy_wise_search}
                 <div class="form-group area-{$column_widths['occupancy']}">
                     <div class="dropdown">
diff --git a/themes/hotel-reservation-theme/_partials/booking-form.tpl b/themes/hotel-reservation-theme/_partials/booking-form.tpl
index 8eabb1ac1..e5e80265c 100644
--- a/themes/hotel-reservation-theme/_partials/booking-form.tpl
+++ b/themes/hotel-reservation-theme/_partials/booking-form.tpl
@@ -250,4 +250,4 @@
             {/block}
         </div>
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
index 054139bea..4917113e1 100644
--- a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
+++ b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
@@ -114,4 +114,4 @@
             {/if}
         </div>
     </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl b/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl
index c1b3de052..b146f5da9 100644
--- a/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl
+++ b/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl
@@ -92,4 +92,4 @@
             </div>
         </li>
     {/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/_partials/service-products.tpl b/themes/hotel-reservation-theme/_partials/service-products.tpl
index 7e3513c52..73d3a042a 100644
--- a/themes/hotel-reservation-theme/_partials/service-products.tpl
+++ b/themes/hotel-reservation-theme/_partials/service-products.tpl
@@ -62,4 +62,4 @@
             </div>
         {/block}
     {/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/address.tpl b/themes/hotel-reservation-theme/address.tpl
index 9959652a0..744199464 100644
--- a/themes/hotel-reservation-theme/address.tpl
+++ b/themes/hotel-reservation-theme/address.tpl
@@ -258,4 +258,4 @@
 		{/if}
 		{/strip}
 	{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl
index 9151a2720..4bf0fbce9 100644
--- a/themes/hotel-reservation-theme/authentication.tpl
+++ b/themes/hotel-reservation-theme/authentication.tpl
@@ -73,7 +73,7 @@
 								<label for="email_create" class="">{l s='Email address'}</label>
 								<input type="email" class="is_required validate account_input form-control" data-validate="isEmail" id="email_create" name="email_create" value="{if isset($smarty.post.email_create)}{$smarty.post.email_create|stripslashes}{/if}" />
 							</div>
-							{block name='authentication_submit_create_account'}
+							{block name='authentication_create_account_submit'}
 								<div class="submit">
 									{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 									<button class="btn button button-medium" type="submit" id="SubmitCreate" name="SubmitCreate">
@@ -105,7 +105,7 @@
 								{hook h='displayLoginFormFieldsAfter'}
 							{/block}
 							<p class="lost_password form-group"><a href="{$link->getPageLink('password')|escape:'html':'UTF-8'}" title="{l s='Recover your forgotten password'}" rel="nofollow">{l s='Forgot your password?'}</a></p>
-							{block name='authentication_submit_login_account'}
+							{block name='authentication_login_submit'}
 								<p class="submit">
 									{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
 									<button type="submit" id="SubmitLogin" name="SubmitLogin" class="btn button button-medium">
@@ -428,7 +428,7 @@
 					<p class="cart_navigation required submit clearfix">
 						<span><sup>*</sup>{l s='Required field'}</span>
 						<input type="hidden" name="display_guest_checkout" value="1" />
-						{block name='authentication_submit_guest_account'}
+						{block name='authentication_guest_submit'}
 							<button type="submit" class="button btn btn-default button-medium" name="submitGuestAccount" id="submitGuestAccount">
 								<span>
 									{l s='Proceed to checkout'}
@@ -702,7 +702,7 @@
 					<input type="hidden" name="email_create" value="1" />
 					<input type="hidden" name="is_new_customer" value="1" />
 					{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'html':'UTF-8'}" />{/if}
-					{block name='authentication_submit_account'}
+					{block name='authentication_account_submit'}
 						<button type="submit" name="submitAccount" id="submitAccount" class="btn button button-medium">
 							<span>{l s='Register'}&nbsp;<i class="icon-chevron-right right"></i></span>
 						</button>
diff --git a/themes/hotel-reservation-theme/category.tpl b/themes/hotel-reservation-theme/category.tpl
index 1504e7691..653b3c8c7 100644
--- a/themes/hotel-reservation-theme/category.tpl
+++ b/themes/hotel-reservation-theme/category.tpl
@@ -65,4 +65,4 @@
             {/if}
         {/strip}
     {/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl
index 545fd3d8e..5d1bda25e 100644
--- a/themes/hotel-reservation-theme/contact-form.tpl
+++ b/themes/hotel-reservation-theme/contact-form.tpl
@@ -225,4 +225,4 @@
 			{/strip}
 		{/if}
 	{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/history.tpl b/themes/hotel-reservation-theme/history.tpl
index 1a2a1ddf7..ad49799a0 100644
--- a/themes/hotel-reservation-theme/history.tpl
+++ b/themes/hotel-reservation-theme/history.tpl
@@ -172,4 +172,4 @@
 		</ul>
 	{/block}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl
index c57eb8de5..906cbb03d 100644
--- a/themes/hotel-reservation-theme/identity.tpl
+++ b/themes/hotel-reservation-theme/identity.tpl
@@ -235,4 +235,4 @@
             </li>
         </ul>
     {/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/index.tpl b/themes/hotel-reservation-theme/index.tpl
index 9b993c90f..f7af4f056 100644
--- a/themes/hotel-reservation-theme/index.tpl
+++ b/themes/hotel-reservation-theme/index.tpl
@@ -39,4 +39,4 @@
 	{if isset($HOOK_HOME) && $HOOK_HOME|trim}
 		<div class="clearfix">{$HOOK_HOME}</div>
 	{/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
index 3aba5c8cc..9e0b44472 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
@@ -501,4 +501,4 @@
 	{* ###################################################################
 	End
 	################################################################### *}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/my-account.tpl b/themes/hotel-reservation-theme/my-account.tpl
index d39dd502b..e3c8a3b01 100644
--- a/themes/hotel-reservation-theme/my-account.tpl
+++ b/themes/hotel-reservation-theme/my-account.tpl
@@ -73,4 +73,4 @@
         </ul>
     {/block}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
index bb31f1696..d2fc7d502 100644
--- a/themes/hotel-reservation-theme/order-confirmation.tpl
+++ b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -148,7 +148,7 @@
 														</p>
 													</td>
 												{/block}
-												{block name='order_confirmation_order_room_total'}
+												{block name='order_confirmation_cart_total'}
 													<td class="cart_total text-left">
 														<p class="text-left">
 															{if $group_use_tax}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index f0d002363..9f7d1445c 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -1019,4 +1019,4 @@
         {/strip}
     {/block}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-follow.tpl b/themes/hotel-reservation-theme/order-follow.tpl
index 9335d9315..7399f54c8 100644
--- a/themes/hotel-reservation-theme/order-follow.tpl
+++ b/themes/hotel-reservation-theme/order-follow.tpl
@@ -87,4 +87,4 @@
 			<li><a class="btn btn-default button button-small" href="{if isset($force_ssl) && $force_ssl}{$base_dir_ssl}{else}{$base_dir}{/if}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
 		</ul>
 	{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
index 505938a9a..fadb5f269 100644
--- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
+++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
@@ -294,7 +294,7 @@
                     {block name='displayCustomerAccountForm'}
                         {$HOOK_CREATE_ACCOUNT_FORM}
                     {/block}
-    				{block name='order_opc_edit_guest_info_submit_account'}
+    				{block name='order_opc_edit_guest_info_account_submit'}
                         <div class="submit opc-add-save clearfix">
                             <button type="submit" name="submitAccount" id="submitAccount" class="btn btn-default button button-medium pull-right"><span>{l s='Save'}<i class="icon-chevron-right right"></i></span></button>
                         </div>
@@ -330,4 +330,4 @@
         {/strip}
     {/block}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl b/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
index 09e443076..961d0333c 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
@@ -376,13 +376,12 @@
                             {block name='displayCustomerAccountForm'}
                                 {$HOOK_CREATE_ACCOUNT_FORM}
                             {/block}
-                            {block name='order_opc_new_account_advanced_submit_account'}
+                            {block name='order_opc_new_account_advanced_account_submit'}
                                 <div class="submit opc-add-save clearfix">
                                     <p class="required opc-required pull-right">
                                         <sup>*</sup>{l s='Required field'}
                                     </p>
                                     <button type="submit" name="submitAccount" id="submitAccount" data-adv-api="1" class="btn btn-default button button-medium"><span>{l s='Save'}<i class="icon-chevron-right right"></i></span></button>
-
                                 </div>
                             {/block}
                             <div style="display: none;" id="opc_account_saved" class="alert alert-success">
@@ -422,4 +421,4 @@
             {/if}
         {/strip}
     {/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl
index 8a747b57b..35718d43b 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl
@@ -403,7 +403,7 @@
 					{block name='displayCustomerAccountForm'}
 						{$HOOK_CREATE_ACCOUNT_FORM}
 					{/block}
-					{block name='order_opc_new_account_new_account_submit'}
+					{block name='order_opc_new_account_submit'}
 						<div class="submit opc-add-save clearfix">
 							<button type="submit" name="submitAccount" id="submitAccount" class="btn btn-default button button-medium pull-right"><span>{l s='Save'}<i class="icon-chevron-right right"></i></span></button>
 						</div>
@@ -418,4 +418,4 @@
 			{addJsDef countries=$countries}
 		{/if}
 	{/strip}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-payment-advanced.tpl b/themes/hotel-reservation-theme/order-payment-advanced.tpl
index 3c50b3b31..4e80e3cd1 100644
--- a/themes/hotel-reservation-theme/order-payment-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-payment-advanced.tpl
@@ -147,4 +147,4 @@
 
         {include file="$tpl_dir./shopping-cart-advanced.tpl"}
     {/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl
index fddbcb7bf..3a9f0824d 100644
--- a/themes/hotel-reservation-theme/order-return.tpl
+++ b/themes/hotel-reservation-theme/order-return.tpl
@@ -190,4 +190,4 @@
 			<li><a class="btn btn-default button button-small" href="{if isset($force_ssl) && $force_ssl}{$base_dir_ssl}{else}{$base_dir}{/if}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
 		</ul>
 	{/block}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl
index 205caab61..21e49ab43 100644
--- a/themes/hotel-reservation-theme/product.tpl
+++ b/themes/hotel-reservation-theme/product.tpl
@@ -865,4 +865,4 @@
 		{/strip}
 	{/block}
 	{/if}
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/shopping-cart-advanced.tpl b/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
index 86efffbfc..038bdc978 100644
--- a/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
@@ -385,4 +385,4 @@
     {addJsDef deliveryAddress=$cart->id_address_delivery|intval}
     {/strip}
 
-{/block}
\ No newline at end of file
+{/block}
diff --git a/themes/hotel-reservation-theme/shopping-cart.tpl b/themes/hotel-reservation-theme/shopping-cart.tpl
index 56a070b4f..56f7f6934 100644
--- a/themes/hotel-reservation-theme/shopping-cart.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart.tpl
@@ -484,4 +484,4 @@
 			{* </div> *}
 		</div>
 	{/block}
-{/block}
\ No newline at end of file
+{/block}