diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index 0ba693956..1b622fa70 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -23,12 +23,12 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='block-cart'}
+{block name='block_cart'}
 	<!-- MODULE Block cart -->
 	{if isset($blockcart_top) && $blockcart_top}
 	<div class="header-top-item {if $PS_CATALOG_MODE}header_user_catalog{/if}">
 	{/if}
-		{block name='block-cart-shopping-cart'}
+		{block name='block_cart_shopping_cart'}
 			<div class="shopping_cart">
 				<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> -->
@@ -262,7 +262,7 @@
 	</div>
 	{/if}
 	{counter name=active_overlay assign=active_overlay}
-	{block name='block-cart-layer-cart'}
+	{block name='block_cart_layer_cart'}
 		{if !$PS_CATALOG_MODE && $active_overlay == 1}
 			<div id="layer_cart">
 				<div class="clearfix">
@@ -411,7 +411,7 @@
 			<div class="layer_cart_overlay"></div>
 		{/if}
 	{/block}
-	{block name='blockcart-js-vars'}
+	{block name='blockcart_js_vars'}
 		{strip}
 		{addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD}
diff --git a/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl b/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl
index 6ac88f295..807ee1166 100644
--- a/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl
+++ b/modules/blockcurrencies/views/templates/hook/blockcurrencies.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='block-currencies'}
+{block name='block_currencies'}
     {if count($currencies) > 1}
         <div id="currencies-block-top" class="currencies-block-wrap nav-main-item-right hidden-xs pull-right">
             <div class="dropdown">
diff --git a/modules/blocklanguages/views/templates/hook/blocklanguages.tpl b/modules/blocklanguages/views/templates/hook/blocklanguages.tpl
index 840deb76e..075f16d45 100644
--- a/modules/blocklanguages/views/templates/hook/blocklanguages.tpl
+++ b/modules/blocklanguages/views/templates/hook/blocklanguages.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='block-languages'}
+{block name='block_languages'}
     {if count($languages) > 1}
         <div id="languages-block-top" class="languages-block-wrap nav-main-item-right hidden-xs pull-right">
             <div class="dropdown">
diff --git a/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl b/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl
index 0baeda3af..13be38045 100644
--- a/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl
+++ b/modules/blocknavigationmenu/views/templates/hook/navigationMenuBlock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='navigation-menu-block'}
+{block name='navigation_menu_block'}
 	<div class="header-top-item">
 		<button type="button" class="nav_toggle">
 			<span class="icon-bar"></span>
diff --git a/modules/blocknavigationmenu/views/templates/hook/wkFooterNavigationBlock.tpl b/modules/blocknavigationmenu/views/templates/hook/wkFooterNavigationBlock.tpl
index 69b41f4ee..8266a3fda 100644
--- a/modules/blocknavigationmenu/views/templates/hook/wkFooterNavigationBlock.tpl
+++ b/modules/blocknavigationmenu/views/templates/hook/wkFooterNavigationBlock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='footer-navigation-block'}
+{block name='footer_navigation_block'}
 	{if isset($navigation_links) && $navigation_links}
 		<div class="col-sm-3">
 			<div class="row">
diff --git a/modules/hotelreservationsystem/views/templates/hook/display-nav.tpl b/modules/hotelreservationsystem/views/templates/hook/display-nav.tpl
index e10613b65..8a0879bea 100644
--- a/modules/hotelreservationsystem/views/templates/hook/display-nav.tpl
+++ b/modules/hotelreservationsystem/views/templates/hook/display-nav.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='display-nav'}
+{block name='display_nav'}
     {if $email != ''}
         <div class="contact-item">
             <i class="icon-envelope-o"></i>
diff --git a/modules/hotelreservationsystem/views/templates/hook/headerHotelDescBlock.tpl b/modules/hotelreservationsystem/views/templates/hook/headerHotelDescBlock.tpl
index 0e1747f04..3731d4480 100644
--- a/modules/hotelreservationsystem/views/templates/hook/headerHotelDescBlock.tpl
+++ b/modules/hotelreservationsystem/views/templates/hook/headerHotelDescBlock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='header-hotel-desc-block'}
+{block name='header_hotel_desc_block'}
 	<div class="header-desc-container">
 		<div class="header-desc-wrapper">
 			<div class="header-desc-primary">
diff --git a/modules/wkabouthotelblock/views/templates/hook/hotelInteriorBlock.tpl b/modules/wkabouthotelblock/views/templates/hook/hotelInteriorBlock.tpl
index f5b90951c..3595627f1 100644
--- a/modules/wkabouthotelblock/views/templates/hook/hotelInteriorBlock.tpl
+++ b/modules/wkabouthotelblock/views/templates/hook/hotelInteriorBlock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='hotel-interior-block'}
+{block name='hotel_interior_block'}
     {if isset($InteriorImg) && $InteriorImg}
         <div id="hotelInteriorBlock" class="row home_block_container">
             <div class="col-xs-12 col-sm-12">
@@ -31,7 +31,7 @@
                         </div>
                     </div>
                 {/if}
-                {block name='hotel-interior-images'}
+                {block name='hotel_interior_images'}
                     <div class="row home_block_content htlInterior-owlCarousel">
                         <div class="col-sm-12 col-xs-12">
                             <div class="owl-carousel owl-theme">
diff --git a/modules/wkhotelfeaturesblock/views/templates/hook/hotelfeaturescontent.tpl b/modules/wkhotelfeaturesblock/views/templates/hook/hotelfeaturescontent.tpl
index 4a9a94415..6348f12d1 100644
--- a/modules/wkhotelfeaturesblock/views/templates/hook/hotelfeaturescontent.tpl
+++ b/modules/wkhotelfeaturesblock/views/templates/hook/hotelfeaturescontent.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='hotel-features-content'}
+{block name='hotel_features_content'}
     {if isset($hotelAmenities) && $hotelAmenities}
         <div id="hotelAmenitiesBlock" class="row home_block_container">
             <div class="col-xs-12 col-sm-12 home_amenities_wrapper">
@@ -30,7 +30,7 @@
                         </div>
                     </div>
                 {/if}
-                {block name='hotel-features-content-images'}
+                {block name='hotel_features_content_images'}
                     <div class="homeAmenitiesBlock home_block_content">
                         {assign var='amenityPosition' value=0}
                         {assign var='amenityIteration' value=0}
diff --git a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
index b712812b7..82580d5d5 100644
--- a/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
+++ b/modules/wkhotelfilterblock/views/templates/hook/htlfilterblock.tpl
@@ -17,10 +17,10 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='htl-filter-block'}
+{block name='htl_filter_block'}
 	<div id="filter_results" class="row block">
 		<div class="col-sm-12">
-			{block name='htl-filter-block-amenities-filter'}
+			{block name='htl_filter_block_amenities_filter'}
 				{if isset($config) && $config['SHOW_AMENITIES_FILTER'] && $all_feat}
 					<div class="row margin-lr-0 layered_filter_cont">
 						<div class="col-sm-12 layered_filter_heading">
@@ -44,7 +44,7 @@
 				{/if}
 			{/block}
 
-			{block name='htl-filter-block-price-filter'}
+			{block name='htl_filter_block_price_filter'}
 				{if isset($config) && $config['SHOW_PRICE_FILTER']}
 					<div class="row margin-lr-0 layered_filter_cont">
 						<div class="col-sm-12 layered_filter_heading">
@@ -68,7 +68,7 @@
 			{/block}
 		</div>
 	</div>
-	{block name='htl-filter-block-js-vars'}
+	{block name='htl_filter_block_js_vars'}
 		{strip}
 			{addJsDef num_days = $num_days}
 			{addJsDef date_from = $date_from}
diff --git a/modules/wkhotelroom/views/templates/hook/hotelRoomDisplayBlock.tpl b/modules/wkhotelroom/views/templates/hook/hotelRoomDisplayBlock.tpl
index 4b9529982..aeae7de83 100644
--- a/modules/wkhotelroom/views/templates/hook/hotelRoomDisplayBlock.tpl
+++ b/modules/wkhotelroom/views/templates/hook/hotelRoomDisplayBlock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='hotel-room-display-block'}
+{block name='hotel_room_display_block'}
 {if isset($hotelRoomDisplay) && $hotelRoomDisplay}
     <div id="hotelRoomsBlock" class="row home_block_container">
         <div class="col-xs-12 col-sm-12">
@@ -30,7 +30,7 @@
                     </div>
                 </div>
             {/if}
-            {block name='hotel-room-display-block-content'}
+            {block name='hotel_room_display_block_content'}
                 <div class="row home_block_content">
                     <div class="col-sm-12 col-xs-12">
                         {assign var='htlRoomBlockIteration' value=0}
diff --git a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
index b101f3ac8..19a209f51 100644
--- a/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/categoryPageSearch.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='category-page-search'}
+{block name='category_page_search'}
     {if isset($hotels_info) && count($hotels_info)}
         <div class="header-rmsearch-wrapper">
         <div class="filter_header clearfix">
diff --git a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl
index f5ce38de6..f8d84c25e 100644
--- a/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/landingPageSearch.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='landing-page-search'}
+{block name='landing_page_search'}
     {if isset($is_index_page) && $is_index_page}
         <div class="header-rmsearch-container header-rmsearch-hide-xs hidden-xs">
             {if isset($hotels_info) && count($hotels_info)}
diff --git a/modules/wkroomsearchblock/views/templates/hook/landingPageXsBtn.tpl b/modules/wkroomsearchblock/views/templates/hook/landingPageXsBtn.tpl
index 9d1cda7a0..dd2026754 100644
--- a/modules/wkroomsearchblock/views/templates/hook/landingPageXsBtn.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/landingPageXsBtn.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='landing-page-xs-btn'}
+{block name='landing_page_xs_btn'}
 	<div class="row margin-top-20 visible-xs">
 		<div class="col-md-offset-1 col-md-10 col-lg-offset-2 col-lg-8">
 			<button id="xs_room_search" class="btn button button-medium" href="#xs_room_search_form"><span>{l s='Make Booking' mod='wkroomsearchblock'}</span></button>
diff --git a/modules/wkroomsearchblock/views/templates/hook/roomTypePageSearch.tpl b/modules/wkroomsearchblock/views/templates/hook/roomTypePageSearch.tpl
index b2cc1fb36..7c57280ec 100644
--- a/modules/wkroomsearchblock/views/templates/hook/roomTypePageSearch.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/roomTypePageSearch.tpl
@@ -17,9 +17,9 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='room-type-page-search'}
+{block name='room_type_page_search'}
 	{if isset($hotels_info) && count($hotels_info)}
-		{block name='room-type-page-search'}
+		{block name='room_type_page_search'}
 			{* searched information wrapper block*}
 			{if isset($search_data) && $search_data}
 				<div class="header-rmsearch-details-wrapper">
diff --git a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
index 17260ee3e..3fcbc5896 100644
--- a/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
+++ b/modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
@@ -17,9 +17,9 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='search-form'}
+{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_search_field'}
         {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_search_field'}
         {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_search_field'}
         {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_search_field'}
         {if isset($is_occupancy_wise_search) && $is_occupancy_wise_search}
             <div class="form-group area-{$column_widths['occupancy']}">
                 <div class="dropdown">
diff --git a/modules/wktestimonialblock/views/templates/hook/wktestimonialblock.tpl b/modules/wktestimonialblock/views/templates/hook/wktestimonialblock.tpl
index f5b96d3ee..d348a40cc 100644
--- a/modules/wktestimonialblock/views/templates/hook/wktestimonialblock.tpl
+++ b/modules/wktestimonialblock/views/templates/hook/wktestimonialblock.tpl
@@ -17,7 +17,7 @@
 *  @license   https://store.webkul.com/license.html
 *}
 
-{block name='testimonial-block'}
+{block name='testimonial_block'}
     {if isset($testimonials_data) && $testimonials_data}
         <div id="hotelTestimonialBlock" class="row home_block_container">
             <div class="col-xs-12 col-sm-12">
@@ -30,7 +30,7 @@
                         </div>
                     </div>
                 {/if}
-                {block name='testimonial-block-content'}
+                {block name='testimonial_block_content'}
                     <div class="row home_block_content htlTestemonial-owlCarousel">
                         <div class="col-sm-12 col-xs-12">
                             <div class="owl-carousel">
diff --git a/themes/hotel-reservation-theme/_partials/booking-form.tpl b/themes/hotel-reservation-theme/_partials/booking-form.tpl
index a6442b5cc..1f294e42f 100644
--- a/themes/hotel-reservation-theme/_partials/booking-form.tpl
+++ b/themes/hotel-reservation-theme/_partials/booking-form.tpl
@@ -17,12 +17,12 @@
 * @license LICENSE.txt
 *}
 
-{block name='booking-form'}
+{block name='booking_form'}
     <div class="booking-form card">
         <div class="booking_room_fields">
-            {block name='booking-form-form'}
+            {block name='booking_form_form'}
                 <form id="booking-form" action="" method="post">
-                    {block name='booking-form-hotel-location'}
+                    {block name='booking_form_hotel_location'}
                         {if isset($id_hotel) && $id_hotel}
                             <div class="form-group htl_location_block">
                                 <label for="" class="control-label">{l s='Hotel Location'}</label>
@@ -35,7 +35,7 @@
                         {if $product->booking_product}
                             {if  !$order_date_restrict}
                                 <div class="row">
-                                    {block name='booking-form-dates-fields'}
+                                    {block name='booking_form_dates_fields'}
                                         <div class="form-group col-sm-12">
                                             <label class="control-label">{l s='Check In - Check Out'}</label>
                                             <div class="form-control input-date" id="room_date_range"  autocomplete="off" placeholder="{l s='Check-in - Check-out'}"><span>{l s='Check-in'} &nbsp;<i class="icon icon-minus"></i>&nbsp; {l s='Check-out'}</span></div>
@@ -45,7 +45,7 @@
                                     {/block}
                                 </div>
                                 {if $total_available_rooms > 0}
-                                    {block name='booking-form-quantity-fields'}
+                                    {block name='booking_form_quantity_fields'}
                                         <div class="row">
                                             <div class="form-group col-sm-12"{if !$product->available_for_order || $PS_CATALOG_MODE} style="display: none;"{/if}>
                                                 {if isset($occupancy_required_for_booking) && $occupancy_required_for_booking}
@@ -58,7 +58,7 @@
                                             </div>
                                         </div>
                                     {/block}
-                                    {block name='booking-form-price-desc'}
+                                    {block name='booking_form_price_desc'}
                                         {if (isset($has_room_type_demands) && $has_room_type_demands) || (isset($service_products_exists) && $service_products_exists)}
                                             <hr class="separator-hr-mg-10">
                                             <div class="row price_desc_block">
@@ -143,7 +143,7 @@
                                             <hr class="separator-hr-mg-10 form-group">
                                         {/if}
                                     {/block}
-                                    {block name='booking-form-actions'}
+                                    {block name='booking_form_actions'}
                                         <div id="booking_action_block">
                                             <div class="row">
                                                 <div class="total_price_block col-xs-7 form-group">
@@ -157,7 +157,7 @@
                                                         {convertPrice price=$total_price|floatval}
                                                     </p>
                                                 </div>
-                                                {block name='booking-form-num-avail'}
+                                                {block name='booking_form_num_avail'}
                                                     {if $total_available_rooms <= $warning_count}
                                                         <div class="col-xs-5 form-group text-right num_quantity_alert">
                                                             <span class="num_searched_avail_rooms">
diff --git a/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl b/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl
index 884ab5da0..6079da7c9 100644
--- a/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl
+++ b/themes/hotel-reservation-theme/_partials/cart_booking_demands.tpl
@@ -17,10 +17,10 @@
 * @license LICENSE.txt
 *}
 
-{block name='cart-booking-demands'}
+{block name='cart_booking_demands'}
 	<section>
 		{if (isset($selectedRoomDemands) && $selectedRoomDemands) || (isset($roomTypeServiceProducts) && $roomTypeServiceProducts)}
-			{block name='cart-booking-demands-tabs'}
+			{block name='cart_booking_demands_tabs'}
 				<ul class="nav nav-tabs">
 					{if isset($selectedRoomDemands) && $selectedRoomDemands}
 						<li class="active"><a href="#room_type_demands_desc" data-toggle="tab">{l s='Facilities'}</a></li>
@@ -30,9 +30,9 @@
 					{/if}
 				</ul>
 			{/block}
-			{block name='cart-booking-demands-tabs-content'}
+			{block name='cart_booking_demands_tabs_content'}
 				<div class="tab-content">
-					{block name='cart-booking-demands-tab-content'}
+					{block name='cart_booking_demands_tab_content'}
 						{if isset($selectedRoomDemands) && $selectedRoomDemands}
 							<div id="room_type_demands_desc" class="tab-pane active">
 								<div class="rooms_extra_demands_head">
@@ -94,7 +94,7 @@
 						{/if}
 					{/block}
 
-					{block name='cart-booking-services-tab-content'}
+					{block name='cart_booking_services_tab_content'}
 						{if isset($roomTypeServiceProducts) && $roomTypeServiceProducts}
 							<div id="room_type_service_product_desc" class="tab-pane{if !isset($selectedRoomDemands) || !$selectedRoomDemands} active{/if}">
 								<div class="rooms_extra_demands_head">
diff --git a/themes/hotel-reservation-theme/_partials/hotel_images.tpl b/themes/hotel-reservation-theme/_partials/hotel_images.tpl
index 0c865ccfb..e338d55a3 100644
--- a/themes/hotel-reservation-theme/_partials/hotel_images.tpl
+++ b/themes/hotel-reservation-theme/_partials/hotel_images.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='hotel-images'}
+{block name='hotel_images'}
     {if is_array($hotel_images) && count($hotel_images)}
         {foreach from=$hotel_images item=hotel_image}
             <div class="col-sm-4 image-item">
diff --git a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
index 0c8daa017..7bb9189cc 100644
--- a/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
+++ b/themes/hotel-reservation-theme/_partials/occupancy_field.tpl
@@ -17,9 +17,9 @@
 * @license LICENSE.txt
 *}
 
-{block name='occupancy-field'}
+{block name='occupancy_field'}
     <div class="form-group dropdown">
-        {block name='occupancy-field-button'}
+        {block name='occupancy_field_button'}
             <button class="form-control booking_guest_occupancy input-occupancy{if isset($error) && $error == 1} error_border{/if}" type="button">
                 <span class="">
                     {if isset($occupancies) && $occupancies}
@@ -31,7 +31,7 @@
             </button>
         {/block}
 
-        {block name='occupancy-field-dropdown'}
+        {block name='occupancy_field_dropdown'}
             <div class="dropdown-menu booking_occupancy_wrapper">
                 <input type="hidden" class="max_avail_type_qty" value="{if isset($total_available_rooms)}{$total_available_rooms|escape:'html':'UTF-8'}{/if}">
                 <input type="hidden" class="max_adults" value="{$room_type_info['max_adults']|escape:'html':'UTF-8'}">
@@ -179,7 +179,7 @@
                         </div>
                     {/if}
                 </div>
-                {block name='occupancy-field-actions'}
+                {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 rooms.'}" data-title-unavailable="{l s='No more rooms available.'}" href="#">
diff --git a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
index 179d1086c..054139bea 100644
--- a/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
+++ b/themes/hotel-reservation-theme/_partials/order-extra-services.tpl
@@ -17,14 +17,14 @@
 * @license LICENSE.txt
 *}
 
-{block name='order-extra-services'}
+{block name='order_extra_services'}
     <div class="card">
         <div class="card-header">
             {l s='Extra Services'}
         </div>
         <div class="card-body">
             {if (isset($extraDemands) && $extraDemands) || (isset($additionalServices) && $additionalServices)}
-                {block name='order-extra-services-tabs'}
+                {block name='order_extra_services_tabs'}
                     <ul class="nav nav-tabs">
                         {if isset($additionalServices) && $additionalServices}
                             <li class="active"><a href="#room_type_service_product_desc" data-toggle="tab">{l s='Services'}</a></li>
@@ -34,9 +34,9 @@
                         {/if}
                     </ul>
                 {/block}
-                {block name='order-extra-services-tabs-content'}
+                {block name='order_extra_services_tabs_content'}
                     <div class="tab-content">
-                        {block name='order-extra-services-tab-content'}
+                        {block name='order_extra_services_tab_content'}
                             {if isset($additionalServices) && $additionalServices}
                                 <div id="room_type_service_product_desc" class="tab-pane {if isset($additionalServices) && $additionalServices}active{/if}">
                                     {assign var=roomCount value=1}
@@ -76,7 +76,7 @@
                             {/if}
                         {/block}
 
-                        {block name='order-extra-demands-tab-content'}
+                        {block name='order_extra_demands_tab_content'}
                             {if isset($extraDemands) && $extraDemands}
                                 <div id="room_type_demands_desc" class="tab-pane {if !isset($additionalServices) || !$additionalServices}active{/if}">
                                     {assign var=roomCount value=1}
diff --git a/themes/hotel-reservation-theme/_partials/order-message.tpl b/themes/hotel-reservation-theme/_partials/order-message.tpl
index 9f4604d03..042ff09e5 100644
--- a/themes/hotel-reservation-theme/_partials/order-message.tpl
+++ b/themes/hotel-reservation-theme/_partials/order-message.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='order-message'}
+{block name='order_message'}
     <div class="message {if isset($message.id_employee) && $message.id_employee}management{else}customer{/if}">
         <div class="profile">
             <div class="row">
diff --git a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl
index 531b16285..111456f5c 100644
--- a/themes/hotel-reservation-theme/_partials/order-room-detail.tpl
+++ b/themes/hotel-reservation-theme/_partials/order-room-detail.tpl
@@ -17,17 +17,17 @@
 * @license LICENSE.txt
 *}
 
-{block name='order-room-detail'}
+{block name='order_room_detail'}
     <div class="booking-room-detail" data-id-product="{$data_v.id_product}" data-date-diff="{$rm_k}">
         <div class="row">
-            {block name='order-room-detial-room-image'}
+            {block name='order_room_detial_room_image'}
                 <div class="col-xs-3 col-sm-2">
                     <a href="{$link->getProductLink($data_v.id_product)|escape:'html':'UTF-8'}" title="{$data_v.name|escape:'html':'UTF-8'}" target="_blank">
                         <img class="img img-responsive img-room-type" src="{$data_v.cover_img|escape:'html':'UTF-8'}" />
                     </a>
                 </div>
             {/block}
-            {block name='order-room-detial-room-details'}
+            {block name='order_room_detial_room_details'}
                 <div class="col-xs-9 col-sm-10 info-wrap">
                     <div class="row">
                         <div class="col-xs-12">
diff --git a/themes/hotel-reservation-theme/_partials/quantity_field.tpl b/themes/hotel-reservation-theme/_partials/quantity_field.tpl
index 8ee374526..f7f2262ea 100644
--- a/themes/hotel-reservation-theme/_partials/quantity_field.tpl
+++ b/themes/hotel-reservation-theme/_partials/quantity_field.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='quantity-field'}
+{block name='quantity_field'}
     <div class="rm_qty_cont form-group clearfix">
         <input type="hidden" class="text-center form-control quantity_wanted" min="1" name="qty" value="{if isset($quantity) && $quantity}{$quantity|escape:'html':'UTF-8'}{else}1{/if}">
         <input type="hidden" class="max_avail_type_qty" value="{if isset($total_available_rooms)}	{$total_available_rooms|escape:'html':'UTF-8'}{/if}">
diff --git a/themes/hotel-reservation-theme/_partials/room_type_list.tpl b/themes/hotel-reservation-theme/_partials/room_type_list.tpl
index 5ea6f0600..dd9a47b7c 100644
--- a/themes/hotel-reservation-theme/_partials/room_type_list.tpl
+++ b/themes/hotel-reservation-theme/_partials/room_type_list.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='room-type-list'}
+{block name='room_type_list'}
 	{block name='displayRoomTypeListBefore'}
 		{hook h='displayRoomTypeListBefore'}
 	{/block}
@@ -25,7 +25,7 @@
 		{foreach from=$booking_data['rm_data'] key=room_k item=room_v}
 			<div class="col-sm-12 room_cont" data-id-product="{$room_v['id_product']|escape:'htmlall':'UTF-8'}">
 				<div class="row">
-					{block name='room-type-list-room-image'}
+					{block name='room_type_list_room_image'}
 						<div class="col-sm-4">
 								<a href="{$room_v['product_link']|escape:'htmlall':'UTF-8'}">
 								<img src="{$room_v['image']|escape:'htmlall':'UTF-8'}" class="img-responsive room-type-image">
@@ -35,9 +35,9 @@
 							</a>
 						</div>
 					{/block}
-					{block name='room-type-list-room-details'}
+					{block name='room_type_list_room_details'}
 						<div class="col-sm-8 room_info_cont">
-							{block name='room-type-list-room-quantity'}
+							{block name='room_type_list_room_quantity'}
 								<div class="row">
 									<p class="rm_heading col-sm-12 col-md-7">{$room_v['name']|escape:'htmlall':'UTF-8'}</p>
 									{if !isset($restricted_country_mode) && !$PS_CATALOG_MODE && !$order_date_restrict}
@@ -48,7 +48,7 @@
 								</div>
 							{/block}
 							<div class="rm_desc">{$room_v['description']|truncate:190:"":true}&nbsp;<a class="view_more" href="{$room_v['product_link']|escape:'htmlall':'UTF-8'}">{l s='View More'}....</a></div>
-							{block name='room-type-list-room-features'}
+							{block name='room_type_list_room_features'}
 								<div class="room_features_cont">
 									<div class="row">
 										<div class="col-sm-12 col-md-5 col-lg-6">
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 330a2c68a..b9fe1c6dc 100644
--- a/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl
+++ b/themes/hotel-reservation-theme/_partials/service-products-list-row.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='service-products-list-row'}
+{block name='service_products_list_row'}
     {if isset($product) && $product}
         <li class="row service-product-element">
             <div class="col-xs-4 col-sm-3 col-md-2">
@@ -33,7 +33,7 @@
             </div>
             <div class="col-xs-8 col-sm-9 col-md-10">
                 <div class="row">
-                    {block name='service-products-list-row-details'}
+                    {block name='service_products_list_row_details'}
                         <div class="col-sm-12 clearfix service-product-block">
                             <span class="service-product-name">{$product['name']}</span>
                         </div>
@@ -44,7 +44,7 @@
                         {/if}
                     {/block}
 
-                    {block name='service-products-list-row-actions'}
+                    {block name='service_products_list_row_actions'}
                         <div class="col-sm-12 service_product_action_block">
                             {if !$PS_CATALOG_MODE && !$order_date_restrict && ($product.show_price && !isset($restricted_country_mode))}
                                 <div class="service-product-price">
diff --git a/themes/hotel-reservation-theme/_partials/service-products-list.tpl b/themes/hotel-reservation-theme/_partials/service-products-list.tpl
index 363236f9f..8d5216379 100644
--- a/themes/hotel-reservation-theme/_partials/service-products-list.tpl
+++ b/themes/hotel-reservation-theme/_partials/service-products-list.tpl
@@ -17,7 +17,7 @@
 * @license LICENSE.txt
 *}
 
-{block name='service-products-list'}
+{block name='service_products_list'}
     {foreach $service_products as $product}
         {if !($product@first && isset($init) && $init == true)}
             <hr>
diff --git a/themes/hotel-reservation-theme/_partials/service-products.tpl b/themes/hotel-reservation-theme/_partials/service-products.tpl
index f9a2988c8..cabfa07fd 100644
--- a/themes/hotel-reservation-theme/_partials/service-products.tpl
+++ b/themes/hotel-reservation-theme/_partials/service-products.tpl
@@ -17,9 +17,9 @@
 * @license LICENSE.txt
 *}
 
-{block name='service-products'}
+{block name='service_products'}
     {if isset($service_products_exists) && $service_products_exists}
-        {block name='service-products-tabs'}
+        {block name='service_products_tabs'}
             <ul class="nav nav-tabs product_description_tabs">
                 {if !$PS_SERVICE_PRODUCT_CATEGORY_FILTER}
                     <li class="active"><a href="#all_products" class="idTabHrefShort" data-toggle="tab">{l s='Services'}</a></li>
@@ -30,7 +30,7 @@
                 {/if}
             </ul>
         {/block}
-        {block name='service-products-tabs-content'}
+        {block name='service_products_tabs_content'}
             <div class="card">
                 <div class="row">
                     <div class="col-sm-12 tab-content">
diff --git a/themes/hotel-reservation-theme/address.tpl b/themes/hotel-reservation-theme/address.tpl
index d51320f33..cd66db704 100644
--- a/themes/hotel-reservation-theme/address.tpl
+++ b/themes/hotel-reservation-theme/address.tpl
@@ -56,7 +56,7 @@
 		</p>
 		{include file="$tpl_dir./errors.tpl"}
 		<p class="required"><sup>*</sup>{l s='Required field'}</p>
-		{block name='address-form'}
+		{block name='address_form'}
 			<form action="{$link->getPageLink('address', true)|escape:'html':'UTF-8'}" method="post" class="std" id="add_address">
 				<!--h3 class="page-subheading">{if isset($id_address)}{l s='Your address'}{else}{l s='New address'}{/if}</h3-->
 				{assign var="stateExist" value=false}
@@ -226,7 +226,7 @@
 			</form>
 		{/block}
 	</div>
-	{block name='address-footer-links'}
+	{block name='address_footer_links'}
 		<ul class="footer_links clearfix">
 			<li>
 				<a class="btn btn-defaul button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
@@ -235,7 +235,7 @@
 			</li>
 		</ul>
 	{/block}
-	{block name='adderss-js-vars'}
+	{block name='adderss_js_vars'}
 		{strip}
 		{if isset($smarty.post.id_state) && $smarty.post.id_state}
 			{addJsDef idSelectedState=$smarty.post.id_state|intval}
diff --git a/themes/hotel-reservation-theme/authentication.tpl b/themes/hotel-reservation-theme/authentication.tpl
index a0781a767..ccc893730 100644
--- a/themes/hotel-reservation-theme/authentication.tpl
+++ b/themes/hotel-reservation-theme/authentication.tpl
@@ -59,7 +59,7 @@
 					</div>
 				</div>
 			{/if}
-			{block name='authentication-create-account-form'}
+			{block name='authentication_create_account_form'}
 				<div class="col-xs-12 col-sm-6">
 					<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="create-account_form" class="box">
 						<h3 class="page-subheading">{l s='Create an account'}</h3>
@@ -84,7 +84,7 @@
 					</form>
 				</div>
 			{/block}
-			{block name='authentication-login-form'}
+			{block name='authentication_login_form'}
 				<div class="col-xs-12 col-sm-6">
 					<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="login_form" class="box">
 						<h3 class="page-subheading">{l s='Already registered?'}</h3>
@@ -118,7 +118,7 @@
 				</div>
 			{/block}
 		</div>
-		{block name='authentication-new-account-form'}
+		{block name='authentication_new_account_form'}
 			{if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED}
 				<form action="{$link->getPageLink('authentication', true, NULL, "back=$back")|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="std clearfix">
 					<div class="box">
@@ -447,7 +447,7 @@
 			</ol>
 		</div>
 		{/if}-->
-		{block name='authentication-account-creation-form'}
+		{block name='authentication_account_creation_form'}
 			<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="account-creation_form" class="std box">
 				{block name='HOOK_CREATE_ACCOUNT_TOP'}
 					{$HOOK_CREATE_ACCOUNT_TOP}
@@ -702,7 +702,7 @@
 			</form>
 		{/block}
 	{/if}
-	{block name='authentication-js-vars'}
+	{block name='authentication_js_vars'}
 		{strip}
 		{if isset($smarty.post.id_state) && $smarty.post.id_state}
 			{addJsDef idSelectedState=$smarty.post.id_state|intval}
diff --git a/themes/hotel-reservation-theme/category.tpl b/themes/hotel-reservation-theme/category.tpl
index 6c0b3d07d..449ed90c5 100644
--- a/themes/hotel-reservation-theme/category.tpl
+++ b/themes/hotel-reservation-theme/category.tpl
@@ -26,7 +26,7 @@
 {block name='category'}
     <div class="row cat_cont">
         <div class="col-sm-12">
-            {block name='category-sort'}
+            {block name='category_sort'}
                 <div class="row margin-lr-0 catSortBlock">
                     <div class="col-sm-2 sortBlockHeading">
                         <p>{l s='Sort By:'}</p>
@@ -53,7 +53,7 @@
         </div>
     </div>
 
-    {block name='category-js-vars'}
+    {block name='category_js_vars'}
         {strip}
             {addJsDef product_controller_url=$link->getPageLink('product')}
             {* {addJsDef feat_img_dir=$feat_img_dir} *}
diff --git a/themes/hotel-reservation-theme/cms.tpl b/themes/hotel-reservation-theme/cms.tpl
index 12a7d212e..5e656370c 100644
--- a/themes/hotel-reservation-theme/cms.tpl
+++ b/themes/hotel-reservation-theme/cms.tpl
@@ -74,7 +74,7 @@
 		</div>
 	{/if}
 	<br />
-	{block name='cms-js-vars'}
+	{block name='cms_js_vars'}
 		{strip}
 			{if isset($smarty.get.ad) && $smarty.get.ad}
 				{addJsDefL name=ad}{$base_dir|cat:$smarty.get.ad|escape:'html':'UTF-8'}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/contact-form.tpl b/themes/hotel-reservation-theme/contact-form.tpl
index 3debe1d62..27ffce83e 100644
--- a/themes/hotel-reservation-theme/contact-form.tpl
+++ b/themes/hotel-reservation-theme/contact-form.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='contact-form'}
+{block name='contact_form'}
 {if isset($smarty.get.confirm)}
 	<p class="alert alert-success">{l s='Your message has been successfully sent to our team.'}</p>
 {/if}
@@ -35,7 +35,7 @@
 	</div>
 	<div class="row margin-top-50">
 		{if (isset($gblHtlAddress) && $gblHtlAddress) && (isset($gblHtlPhone) && $gblHtlPhone) && (isset($gblHtlEmail) && $gblHtlEmail)}
-			{block name='contact-form-gloal-hotel-address'}
+			{block name='contact_form_gloal_hotel_address'}
 				<div class="col-sm-6">
 					<div class="htl-global-address-div col-md-8 col-sm-12">
 						{if isset($gblHtlPhone) && $gblHtlPhone }
@@ -66,7 +66,7 @@
 				</div>
 			{/block}
 		{/if}
-		{block name='contact-form-form'}
+		{block name='contact_form_form'}
 			<div class="col-sm-6 {if !(isset($gblHtlAddress) && $gblHtlAddress) && !(isset($gblHtlPhone) && $gblHtlPhone) && !(isset($gblHtlEmail) && $gblHtlEmail)} col-sm-offset-3 {/if}">
 				<form action="{$link->getPageLink('contact')}" method="post" class="contact-form-box" enctype="multipart/form-data">
 					{if isset($customerThread.id_contact) && $customerThread.id_contact && $contacts|count}
@@ -153,7 +153,7 @@
 			</div>
 		{/block}
 	</div>
-	{block name='contact-form-hotel-locations'}
+	{block name='contact_form_hotel_locations'}
 		{if isset($hotelsInfo) && $hotelsInfo}
 			<div class="row hotels-container">
 				<div class="col-sm-12 hotel-header">
@@ -201,7 +201,7 @@
 	{/block}
 </div>
 
-	{block name='contact-form-js-vars'}
+	{block name='contact_form_js_vars'}
 		{strip}
 			{addJsDefL name='contact_fileDefaultHtml'}{l s='No file selected' js=1}{/addJsDefL}
 			{addJsDefL name='contact_fileButtonHtml'}{l s='Choose File' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/discount.tpl b/themes/hotel-reservation-theme/discount.tpl
index 1bac34469..0828e07c9 100644
--- a/themes/hotel-reservation-theme/discount.tpl
+++ b/themes/hotel-reservation-theme/discount.tpl
@@ -95,7 +95,7 @@
 		<p class="alert alert-warning">{l s='You do not have any vouchers.'}</p>
 	{/if}
 
-	{block name='discount-footer-links'}
+	{block name='discount_footer_links'}
 		<ul class="footer_links clearfix">
 			<li>
 				<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
diff --git a/themes/hotel-reservation-theme/guest-tracking.tpl b/themes/hotel-reservation-theme/guest-tracking.tpl
index 4b002f5be..e6a698d82 100644
--- a/themes/hotel-reservation-theme/guest-tracking.tpl
+++ b/themes/hotel-reservation-theme/guest-tracking.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='guest-tracking'}
+{block name='guest_tracking'}
 	{capture name=path}{l s='Guest Tracking'}{/capture}
 
 	<h1 class="page-heading">{l s='Guest Tracking'}</h1>
@@ -76,7 +76,7 @@
 			</div>
 		{/foreach}
 
-		{block name='guest-tracking-guest-transform'}
+		{block name='guest_tracking_guest_transform'}
 			<div class="row">
 				<div class="col-md-8">
 					{if isset($transformSuccess)}
@@ -124,7 +124,7 @@
 		{if isset($show_login_link) && $show_login_link}
 			<p><img src="{$img_dir}icon/userinfo.gif" alt="{l s='Information'}" class="icon" /><a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='Click here to log in to your customer account.'}</a><br /><br /></p>
 		{/if}
-		{block name='guest-tracking-form'}
+		{block name='guest_tracking_form'}
 			<form method="post" action="{$action|escape:'html':'UTF-8'}" class="std" id="guestTracking">
 				<fieldset class="description_box box">
 					<h2 class="page-subheading">{l s='To track your order, please enter the following information:'}</h2>
diff --git a/themes/hotel-reservation-theme/identity.tpl b/themes/hotel-reservation-theme/identity.tpl
index c80e21b3b..f25bfbcc6 100644
--- a/themes/hotel-reservation-theme/identity.tpl
+++ b/themes/hotel-reservation-theme/identity.tpl
@@ -54,7 +54,7 @@
             <p class="required">
                 <sup>*</sup>{l s='Required field'}
             </p>
-            {block name='identity-form'}
+            {block name='identity_form'}
                 <form action="{$link->getPageLink('identity', true)|escape:'html':'UTF-8'}" method="post" class="std">
                     <fieldset>
                         <div class="clearfix">
@@ -216,7 +216,7 @@
             {/block}
         {/if}
     </div>
-    {block name='identity-footer-links'}
+    {block name='identity_footer_links'}
         <ul class="footer_links clearfix">
             <li>
                 <a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)}">
diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
index 0ba693956..1b622fa70 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
@@ -23,12 +23,12 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='block-cart'}
+{block name='block_cart'}
 	<!-- MODULE Block cart -->
 	{if isset($blockcart_top) && $blockcart_top}
 	<div class="header-top-item {if $PS_CATALOG_MODE}header_user_catalog{/if}">
 	{/if}
-		{block name='block-cart-shopping-cart'}
+		{block name='block_cart_shopping_cart'}
 			<div class="shopping_cart">
 				<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> -->
@@ -262,7 +262,7 @@
 	</div>
 	{/if}
 	{counter name=active_overlay assign=active_overlay}
-	{block name='block-cart-layer-cart'}
+	{block name='block_cart_layer_cart'}
 		{if !$PS_CATALOG_MODE && $active_overlay == 1}
 			<div id="layer_cart">
 				<div class="clearfix">
@@ -411,7 +411,7 @@
 			<div class="layer_cart_overlay"></div>
 		{/if}
 	{/block}
-	{block name='blockcart-js-vars'}
+	{block name='blockcart_js_vars'}
 		{strip}
 		{addJsDefL name=someErrorCondition}{l s='Some Error occured.Please try again.' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDef CUSTOMIZE_TEXTFIELD=$CUSTOMIZE_TEXTFIELD}
diff --git a/themes/hotel-reservation-theme/my-account.tpl b/themes/hotel-reservation-theme/my-account.tpl
index 925ce4914..1241bdd42 100644
--- a/themes/hotel-reservation-theme/my-account.tpl
+++ b/themes/hotel-reservation-theme/my-account.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='my-account'}
+{block name='my_account'}
     {capture name=path}{l s='My account'}{/capture}
 
     <h1 class="page-heading">{l s='My account'}</h1>
@@ -63,7 +63,7 @@
         {hook h='displayCustomerAccountAfterTabs'}
     {/block}
 
-    {block name='my-account-footer-links'}
+    {block name='my_account_footer_links'}
         <ul class="footer_links clearfix">
         <li><a class="btn btn-default button button-small" href="{if isset($force_ssl) && $force_ssl}{$base_dir_ssl}{else}{$base_dir}{/if}" title="{l s='Home'}"><span><i class="icon-chevron-left"></i> {l s='Home'}</span></a></li>
         </ul>
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
index 33cc4becc..d76ccf490 100644
--- a/themes/hotel-reservation-theme/order-confirmation.tpl
+++ b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-confirmation'}
+{block name='order_confirmation'}
 	{capture name=path}{l s='Order confirmation'}{/capture}
 
 	<h1 class="page-heading">{l s='Order confirmation'}</h1>
@@ -63,7 +63,7 @@
 				{/if}
 				<hr>
 				<p><strong>{l s='Order Details -'}</strong></p>
-				{block name='order-detail-content'}
+				{block name='order_detail_content'}
 					<div id="order-detail-content" class="">
 						<table class="table table-bordered">
 							{if isset($cart_htl_data)}
@@ -405,7 +405,7 @@
 	</div>
 
 	{* Fancybox for extra demands*}
-	{block name='order-confirmation-room-extra-services'}
+	{block name='order_confirmation_room_extra_services'}
 		<div style="display:none;" id="rooms_extra_services">
 			{* <div id="rooms_type_extra_demands">
 				<div class="panel">
@@ -418,7 +418,7 @@
 			</div> *}
 		</div>
 	{/block}
-	{block name='order-confirmation-js-vars'}
+	{block name='order_confirmation_js_vars'}
 		{strip}
 			{addJsDef historyUrl=$link->getPageLink("orderdetail", true)|escape:'quotes':'UTF-8'}
 			{addJsDefL name=req_sent_msg}{l s='Request Sent..' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index 13f1ccaf9..f438699c9 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-detail'}
+{block name='order_detail'}
     {capture name=path}
         <a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
             {l s='My account'}
@@ -68,7 +68,7 @@
                     {hook h='displayOrderDetailTopLeft' id_order=$order->id}
                 {/block}
 
-                {block name='order-detail-hotel-details'}
+                {block name='order_detail_hotel_details'}
                     <div class="card hotel-details">
                         <div class="card-header">
                             {l s='Hotel Details'}
@@ -103,7 +103,7 @@
                     </div>
                 {/block}
 
-                {block name='order-details-payment-details-mobile'}
+                {block name='order_details_payment_details_mobile'}
                     <div class="card payment-details visible-xs visible-sm hidden-md hidden-lg">
                         <div class="card-header">
                             {l s='Payment Details'}
@@ -147,7 +147,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-hotel-location-mobile'}
+                {block name='order_detail_hotel_location_mobile'}
                     <div class="card hotel-location visible-xs visible-sm hidden-md hidden-lg">
                         <div class="card-header">
                             {l s='Hotel Location'}
@@ -182,7 +182,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-refund-requests'}
+                {block name='order_detail_refund_requests'}
                     {if isset($refundReqBookings) && $refundReqBookings}
                         <div class="alert alert-info-light cancel_requests_link_wrapper">
                             <i class="icon-info-circle"></i>
@@ -199,7 +199,7 @@
                     {hook h='displayOrderDetailRoomDetailsBefore' id_order=$order->id}
                 {/block}
 
-                {block name='order-detail-room-details'}
+                {block name='order_detail_room_details'}
                     <div class="card room-details">
                         <div class="card-header">
                             {l s='Room Details'}
@@ -241,7 +241,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-payment-summary-mobile'}
+                {block name='order_detail_payment_summary_mobile'}
                     <div class="card payment-summary visible-xs visible-sm hidden-md hidden-lg">
                         <div class="card-header">
                             {l s='Payment Summary'}
@@ -339,7 +339,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-guest-details-mobile'}
+                {block name='order_detail_guest_details_mobile'}
                     <div class="card guest-details visible-xs visible-sm hidden-md hidden-lg">
                         <div class="card-header">
                             {l s='Guest Details'}
@@ -420,7 +420,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-hotel-policies'}
+                {block name='order_detail_hotel_policies'}
                     {assign var=has_general_hotel_policies value=(isset($obj_hotel_branch_information->policies) && $obj_hotel_branch_information->policies)}
                     {assign var=has_refund_hotel_policies value=($obj_hotel_branch_information->isRefundable() && $hotel_refund_rules)}
                     {if $has_general_hotel_policies || $has_refund_hotel_policies}
@@ -470,7 +470,7 @@
                     {/if}
                 {/block}
 
-                {block name='order-detail-order-messages'}
+                {block name='order_detail_order_messages'}
                     {if !$is_guest}
                         <div class="card order-messages {if !count($messages)}hide{/if}">
                             <div class="card-header">
@@ -492,7 +492,7 @@
                     {hook h='displayOrderDetailMessagesBefore' id_order=$order->id}
                 {/block}
 
-                {block name='order-detail-add-order-messages'}
+                {block name='order_detail_add_order_messages'}
                     {if !$is_guest}
                         <div class="card add-order-message" id="add-order-message">
                             <div class="card-header">
@@ -506,7 +506,7 @@
                             <div class="card-body">
                                 <div class="errors-block" style="display: none;"></div>
 
-                                {block name='order-detail-add-order-messages-form'}
+                                {block name='order_detail_add_order_messages_form'}
                                     <form action="{$link->getPageLink('order-detail', true)|escape:'html':'UTF-8'}" method="post" class="std" id="sendOrderMessage">
                                         <div class="form-group select-room-type">
                                             <label for="id_product">{l s='Room Type'}</label>
@@ -546,7 +546,7 @@
                     {hook h='displayOrderDetailTopRight' id_order=$order->id}
                 {/block}
 
-                {block name='order-detail-payment-details'}
+                {block name='order_detail_payment_details'}
                     <div class="card payment-details hidden-xs hidden-sm visible-md">
                         <div class="card-header">
                             {l s='Payment Details'}
@@ -590,7 +590,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-hotel-location'}
+                {block name='order_detail_hotel_location'}
                     <div class="card hotel-location hidden-xs hidden-sm visible-md">
                         <div class="card-header">
                             {l s='Hotel Location'}
@@ -625,7 +625,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-payment-summary'}
+                {block name='order_detail_payment_summary'}
                     <div class="card payment-summary hidden-xs hidden-sm visible-md">
                         <div class="card-header">
                             {l s='Payment Summary'}
@@ -723,7 +723,7 @@
                     </div>
                 {/block}
 
-                {block name='order-detail-guest-details'}
+                {block name='order_detail_guest_details'}
                     <div class="card guest-details hidden-xs hidden-sm visible-md">
                         <div class="card-header">
                             {l s='Guest Details'}
@@ -816,7 +816,7 @@
             </div>
         {/if}
 
-        {block name='order-detail-refund-popups'}
+        {block name='order_detail_refund_popups'}
         {if isset($refund_allowed) && $refund_allowed}
             <div style="display: none;">
                 <div id="create-new-refund-popup">
@@ -998,7 +998,7 @@
         <div id="popup-view-extra-services" class="popup-view-extra-services" style="display: none;"></div>
     {/if}
 
-    {block name='order-detial-js-vars'}
+    {block name='order_detial_js_vars'}
         {strip}
             {addJsDef historyUrl=$link->getPageLink('orderdetail', true)|escape:'quotes':'UTF-8'}
             {addJsDefL name=req_sent_msg}{l s='Request Sent..' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/order-follow.tpl b/themes/hotel-reservation-theme/order-follow.tpl
index 728943a0a..6e6587008 100644
--- a/themes/hotel-reservation-theme/order-follow.tpl
+++ b/themes/hotel-reservation-theme/order-follow.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-follow'}
+{block name='order_follow'}
 	{capture name=path}
 		<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 			{l s='My account'}
@@ -80,7 +80,7 @@
 		{/if}
 	</div>
 
-	{block name='order-follow-footer-links'}
+	{block name='order_follow_footer_links'}
 		<ul class="footer_links clearfix">
 			<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}"><span><i class="icon-chevron-left"></i> {l s='Back to My account'}</span></a></li>
 			<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>
diff --git a/themes/hotel-reservation-theme/order-opc-advanced-payment-option.tpl b/themes/hotel-reservation-theme/order-opc-advanced-payment-option.tpl
index e200ca94d..d91d691f2 100644
--- a/themes/hotel-reservation-theme/order-opc-advanced-payment-option.tpl
+++ b/themes/hotel-reservation-theme/order-opc-advanced-payment-option.tpl
@@ -1,10 +1,10 @@
 
-{block name='order-opc-advanced-payment-option'}
+{block name='order_opc_advanced_payment_option'}
 	{if isset($advance_payment_active)}
 		<div class="opc_advance_payment_block">
 			<p class="block-small-header">{l s='PAYMENT TYPES'}</p>
 			<div class="row adv_payment_type_form">
-			{block name='order-opc-advanced-payment-option-form'}
+			{block name='order_opc_advanced_payment_option_form'}
 					<form method="POST" action="{$link->getPageLink('order-opc')|escape:'html':'UTF-8'}" id="advanced-payment">
 						<div class="col-sm-12 col-xs-12">
 							<label>
diff --git a/themes/hotel-reservation-theme/order-opc-advanced.tpl b/themes/hotel-reservation-theme/order-opc-advanced.tpl
index 6c94f545c..44c5f58e8 100644
--- a/themes/hotel-reservation-theme/order-opc-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-opc-advanced.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-opc-advanced'}
+{block name='order_opc_advanced'}
     {if $opc}
         {assign var="back_order_page" value="order-opc.php"}
     {else}
@@ -45,7 +45,7 @@
             {include file="$tpl_dir./errors.tpl"}
             <p class="alert alert-warning">{l s='Your shopping cart is empty.'}</p>
         {/if}
-        {block name='order-opc-advanced-js-vars'}
+        {block name='order_opc_advanced_js_vars'}
             {strip}
                 {addJsDef imgDir=$img_dir}
                 {addJsDef authenticationUrl=$link->getPageLink("authentication", true)|escape:'quotes':'UTF-8'}
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 8aa2486b9..4233f5da6 100644
--- a/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
+++ b/themes/hotel-reservation-theme/order-opc-edit-guest-info.tpl
@@ -17,10 +17,10 @@
 * @license LICENSE.txt
 *}
 
-{block name='order-opc-edit-guest-info'}
+{block name='order_opc_edit_guest_info'}
     <div id="opc_new_account" class="opc-main-block">
         <div id="opc_new_account-overlay" class="opc-overlay" style="display: none;"></div>
-        {block name='order-opc-edit-guest-info-login-form'}
+        {block name='order_opc_edit_guest_info_login_form'}
             <form action="{$link->getPageLink('authentication', true, NULL, "back=order-opc")|escape:'html':'UTF-8'}" method="post" id="login_form">
                 <fieldset>
                     <div id="login_form_content" style="display:none;">
@@ -45,7 +45,7 @@
                 </fieldset>
             </form>
         {/block}
-        {block name='order-opc-edit-guest-info-new-account-form'}
+        {block name='order_opc_edit_guest_info_new_account_form'}
             <form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="std" autocomplete="on" autofill="on">
                 <div id="opc_account_form" class="unvisible">
                     {block name='HOOK_CREATE_ACCOUNT_TOP'}
@@ -301,7 +301,7 @@
         {/block}
     </div>
 
-    {block name='order-opc-edit-guest-info-js-vars'}
+    {block name='order_opc_edit_guest_info_js_vars'}
         {strip}
             {if isset($guestInformations) && isset($guestInformations.id_state) && $guestInformations.id_state}
                 {addJsDef idSelectedState=$guestInformations.id_state|intval}
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 da1f0c0df..f3888c208 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account-advanced.tpl
@@ -1,8 +1,8 @@
-{block name='order-opc-new-account-advanced'}
+{block name='order_opc_new_account_advanced'}
     <div id="opc_new_account" class="opc-main-block">
         <div id="opc_new_account-overlay" class="opc-overlay" style="display: none;"></div>
         <h2>{l s='Account'}</h2>
-        {block name='order-opc-new-account-advanced-login-form'}
+        {block name='order_opc_new_account_advanced_login_form'}
             <form action="{$link->getPageLink('authentication', true, NULL, "back=order-opc")|escape:'html':'UTF-8'}" method="post" id="login_form" class="box">
                 <fieldset>
                     <h3 class="page-subheading">{l s='Already registered?'}</h3>
@@ -28,7 +28,7 @@
                 </fieldset>
             </form>
         {/block}
-        {block name='order-opc-new-account-advanced-new-account-form'}
+        {block name='order_opc_new_account_advanced_new_account_form'}
             <form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="std" autocomplete="on" autofill="on">
                 <fieldset>
                     <div class="box">
@@ -391,7 +391,7 @@
             </form>
         {/block}
     </div>
-    {block name='order-opc-new-account-advanced-js-vars'}
+    {block name='order_opc_new_account_advanced_js_vars'}
         {strip}
             {if isset($guestInformations) && isset($guestInformations.id_state) && $guestInformations.id_state}
                 {addJsDef idSelectedState=$guestInformations.id_state|intval}
diff --git a/themes/hotel-reservation-theme/order-opc-new-account.tpl b/themes/hotel-reservation-theme/order-opc-new-account.tpl
index defb302a3..2877d37db 100644
--- a/themes/hotel-reservation-theme/order-opc-new-account.tpl
+++ b/themes/hotel-reservation-theme/order-opc-new-account.tpl
@@ -1,7 +1,7 @@
-{block name='order-opc-new-account'}
+{block name='order_opc_new_account'}
 <div id="opc_new_account" class="opc-main-block">
 	<div id="opc_new_account-overlay" class="opc-overlay" style="display: none;"></div>
-	{block name='order-opc-new-account-login-form'}
+	{block name='order_opc_new_account_login_form'}
 		<form action="{$link->getPageLink('authentication', true, NULL, "back=order-opc")|escape:'html':'UTF-8'}" method="post" id="login_form">
 			<fieldset>
 				<div class="already_registered_block">
@@ -43,7 +43,7 @@
 			</fieldset>
 		</form>
 	{/block}
-	{block name='order-opc-new-account-new-account-form'}
+	{block name='order_opc_new_account_new_account_form'}
 		<form action="{$link->getPageLink('authentication', true)|escape:'html':'UTF-8'}" method="post" id="new_account_form" class="std" autocomplete="on" autofill="on">
 			<div id="opc_account_choice" class="row">
 				<div class="col-xs-12">
diff --git a/themes/hotel-reservation-theme/order-opc.tpl b/themes/hotel-reservation-theme/order-opc.tpl
index cb35dd89c..03a69e0e7 100644
--- a/themes/hotel-reservation-theme/order-opc.tpl
+++ b/themes/hotel-reservation-theme/order-opc.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-opc'}
+{block name='order_opc'}
 	{if $opc}
 		{assign var="back_order_page" value="order-opc.php"}
 		{else}
@@ -52,7 +52,7 @@
 									{if isset($checkout_process_steps) && $checkout_process_steps}
 										{foreach $checkout_process_steps as $step}
 											{if $step->step_key == 'checkout_rooms_summary'}
-												{block name='order-opc-checkout-rooms-summary'}
+												{block name='order_opc_checkout_rooms_summary'}
 													<div class="card">
 														<div class="card-header" id="shopping-cart-summary-head">
 															<h5 class="accordion-header" data-toggle="collapse" data-target="#collapse-shopping-cart" aria-expanded="true" aria-controls="collapse-shopping-cart">
@@ -72,7 +72,7 @@
 												{/block}
 											{* End Shopping Cart *}
 											{elseif $step->step_key == 'checkout_customer'}
-												{block name='order-opc-checkout-customer'}
+												{block name='order_opc_checkout_customer'}
 													<div class="card" id="guest-info-block">
 														<div class="card-header" id="guest-info-head">
 															<h5 class="accordion-header" data-toggle="collapse" data-target="#collapse-guest-info" aria-expanded="true" aria-controls="collapse-guest-info">
@@ -186,7 +186,7 @@
 													</div>
 												{/block}
 											{elseif $step->step_key == 'checkout_payment'}
-												{block name='order-opc-checkout-payment'}
+												{block name='order_opc_checkout_payment'}
 													{* <div class="card col-sm-12">
 														<!-- Carrier -->
 														{include file="$tpl_dir./order-carrier.tpl"}
@@ -216,7 +216,7 @@
 								</div>
 							</div>
 							<div class="col-md-4">
-								{block name='order-opc-cart-total-details'}
+								{block name='order_opc_cart_total_details'}
 									{* Total cart details, tax details, advance payment details and voucher details *}
 									<div class="col-sm-12 card cart_total_detail_block">
 										{* {if $total_rooms}
@@ -390,7 +390,7 @@
 										</p>
 									</div>
 								{/block}
-								{block name='order-opc-vouchers'}
+								{block name='order_opc_vouchers'}
 									{* Check if voucher feature is enabled currently *}
 									{if $voucherAllowed}
 										{* Cart vouchers block *}
@@ -467,7 +467,7 @@
 
 							<p class="alert alert-warning">{l s='You have not added any room to your cart yet.'}</p>
 						{/if}
-						{block name='order-opc-js-vars'}
+						{block name='order_opc_js_vars'}
 							{strip}
 								{addJsDef imgDir=$img_dir}
 								{addJsDef authenticationUrl=$link->getPageLink("authentication", true)|escape:'quotes':'UTF-8'}
diff --git a/themes/hotel-reservation-theme/order-payment-advanced.tpl b/themes/hotel-reservation-theme/order-payment-advanced.tpl
index 68039f68a..61ebd787c 100644
--- a/themes/hotel-reservation-theme/order-payment-advanced.tpl
+++ b/themes/hotel-reservation-theme/order-payment-advanced.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-payment-advanced'}
+{block name='order_payment_advanced'}
     {if !isset($addresses_style)}
         {$addresses_style.company = 'address_company'}
         {$addresses_style.firstname = 'address_name'}
@@ -122,7 +122,7 @@
             <!-- END Create account / Guest account / Login block -->
         {/if}
 
-        {block name='order-payment-advanced-terms-conditions'}
+        {block name='order_payment_advanced_terms_conditions'}
             <!-- TNC -->
             {if $conditions AND $cms_id}
                 {if $override_tos_display }
diff --git a/themes/hotel-reservation-theme/order-payment-classic.tpl b/themes/hotel-reservation-theme/order-payment-classic.tpl
index ed9584cae..6a27e24dc 100644
--- a/themes/hotel-reservation-theme/order-payment-classic.tpl
+++ b/themes/hotel-reservation-theme/order-payment-classic.tpl
@@ -23,11 +23,11 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-payment-classic'}
+{block name='order_payment_classic'}
     <div class="paiement_block">
         {include file="$tpl_dir./order-opc-advanced-payment-option.tpl"}
 
-        {block name='order-payment-classic-terms-conditions'}
+        {block name='order_payment_classic_terms_conditions'}
             <div id="tc_cont">
                 <p class="checkbox">
                     <input type="checkbox" name="cgv" id="cgv" value="1" {if $checkedTOS}checked="checked"{/if} />
@@ -42,7 +42,7 @@
         {/block}
         {if $HOOK_PAYMENT}
             {if !$opc}
-                {block name='order-payment-classic-cart-summary'}
+                {block name='order_payment_classic_cart_summary'}
                     <div id="order-detail-content" class="table_block table-responsive">
                         <table id="cart_summary" class="table table-bordered">
                             <thead>
diff --git a/themes/hotel-reservation-theme/order-payment.tpl b/themes/hotel-reservation-theme/order-payment.tpl
index 39b67b192..fe83cf762 100644
--- a/themes/hotel-reservation-theme/order-payment.tpl
+++ b/themes/hotel-reservation-theme/order-payment.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-payment'}
+{block name='order_payment'}
 	{if !$opc}
 		{addJsDefL name=txtProduct}{l s='product' js=1}{/addJsDefL}
 		{addJsDefL name=txtProducts}{l s='products' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/order-return.tpl b/themes/hotel-reservation-theme/order-return.tpl
index dd9a448e1..163cd4431 100644
--- a/themes/hotel-reservation-theme/order-return.tpl
+++ b/themes/hotel-reservation-theme/order-return.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-return'}
+{block name='order_return'}
 	{capture name=path}
 		<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
 			{l s='My account'}
@@ -42,7 +42,7 @@
 		</span>
 	{/capture}
 
-	{block name='order-return-details'}
+	{block name='order_return_details'}
 		{include file="./errors.tpl"}
 		<div class="panel card">
 			<h1 class="page-heading bottom-indent">
@@ -181,7 +181,7 @@
 		</div>
 	{/block}
 
-	{block name='order-return-footer-links'}
+	{block name='order_return_footer_links'}
 		<ul class="footer_links clearfix">
 			<li><a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}"><span><i class="icon-chevron-left"></i> {l s='Back to your account'}</span></a></li>
 			<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>
diff --git a/themes/hotel-reservation-theme/order-slip.tpl b/themes/hotel-reservation-theme/order-slip.tpl
index 16c2d18e8..78da59064 100644
--- a/themes/hotel-reservation-theme/order-slip.tpl
+++ b/themes/hotel-reservation-theme/order-slip.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-slip'}
+{block name='order_slip'}
 	{capture name=path}<a href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">{l s='My account'}</a><span class="navigation-pipe">{$navigationPipe}</span><span class="navigation_page">{l s='Credit slips'}</span>{/capture}
 
 	<h1 class="page-heading bottom-indent">
@@ -41,7 +41,7 @@
 		</p>
 	{/if}
 
-	{block name='order-slip-list'}
+	{block name='order_slip_list'}
 		<div class="block-center" id="block-history">
 			{if $ordersSlip && count($ordersSlip)}
 				<table id="order-list" class="table table-bordered footab">
@@ -104,7 +104,7 @@
 			{/if}
 		</div><!-- #block-history -->
 	{/block}
-	{block name='order-slip-footer-links'}
+	{block name='order_slip_footer_links'}
 		<ul class="footer_links clearfix">
 			<li>
 				<a class="btn btn-default button button-small" href="{$link->getPageLink('my-account', true)|escape:'html':'UTF-8'}">
diff --git a/themes/hotel-reservation-theme/order-steps.tpl b/themes/hotel-reservation-theme/order-steps.tpl
index 7443b3112..91d7f685d 100644
--- a/themes/hotel-reservation-theme/order-steps.tpl
+++ b/themes/hotel-reservation-theme/order-steps.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='order-steps'}
+{block name='order_steps'}
 	{* Assign a value to 'current_step' to display current style *}
 	{capture name="url_back"}
 	{if isset($back) && $back}back={$back}{/if}
diff --git a/themes/hotel-reservation-theme/password.tpl b/themes/hotel-reservation-theme/password.tpl
index b6d2e9d3c..c64af1c0b 100644
--- a/themes/hotel-reservation-theme/password.tpl
+++ b/themes/hotel-reservation-theme/password.tpl
@@ -36,7 +36,7 @@
 	<p class="alert alert-success">{l s='A confirmation email has been sent to your address:'} {if isset($customer_email)}{$customer_email|escape:'html':'UTF-8'|stripslashes}{/if}</p>
 	{else}
 	<p>{l s='Please enter the email address you used to register. We will then send you a new password. '}</p>
-	{block name='password-form'}
+	{block name='password_form'}
 		<form action="{$request_uri|escape:'html':'UTF-8'}" method="post" class="std" id="form_forgotpassword">
 			<fieldset>
 				<div class="form-group">
diff --git a/themes/hotel-reservation-theme/product.tpl b/themes/hotel-reservation-theme/product.tpl
index a87416590..6ae11c9ff 100644
--- a/themes/hotel-reservation-theme/product.tpl
+++ b/themes/hotel-reservation-theme/product.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='room-type'}
+{block name='room_type'}
 	{include file="$tpl_dir./errors.tpl"}
 	{if $errors|@count == 0}
 		{if !isset($priceDisplayPrecision)}
@@ -65,10 +65,10 @@
 					</p>
 				{/if}
 				<!-- left infos-->
-				{block name='room-type-left-column'}
+				{block name='room_type_left_column'}
 					<div class="pb-left-column col-xs-12 col-sm-8 col-md-8">
 						<div class="room_type_img_containter card">
-							{block name='room-type-hotel-name-block'}
+							{block name='room_type_hotel_name_block'}
 								<div class="room_hotel_name_block {if isset($language_is_rtl) && $language_is_rtl}rtl{/if}">
 									<div class="hotel_name_block">
 										<h1><span class="hotel_name">{$product->name}
@@ -88,10 +88,10 @@
 								{hook h='displayRoomTypeDetailRoomTypeImageBlockBefore' id_product=$product->id}
 							{/block}
 							<!-- product img-->
-							{block name='room-type-images'}
+							{block name='room_type_images'}
 								<div class="row">
 
-									{block name='room-type-cover-image'}
+									{block name='room_type_cover_image'}
 										<div id="image-block-cont" class="col-xs-12 col-sm-9 col-sm-push-3 col-md-10 col-md-push-2">
 											<div id="image-block" class="clearfix">
 												<!-- {if $product->new}
@@ -135,7 +135,7 @@
 											</div> <!-- end image-block -->
 										</div>
 									{/block}
-									{block name='room-type-thumbnails'}
+									{block name='room_type_thumbnails'}
 										<div class="col-xs-12 col-sm-3 col-sm-pull-9 col-md-2 col-md-pull-10">
 											{if isset($images) && count($images) > 0}
 												<!-- thumbnails -->
@@ -206,7 +206,7 @@
 							<!-- tab hook is added here -->
 							<!--HOOK_PRODUCT_TAB -->
 							<section class="page-product-box">
-								{block name='room-type-tabs'}
+								{block name='room_type_tabs'}
 									<ul class="nav nav-tabs product_description_tabs">
 										<li class="active"><a href="#product_info_tab" class="idTabHrefShort" data-toggle="tab">{l s='Room Information'}</a></li>
 										{* Block for booking products *}
@@ -221,9 +221,9 @@
 										{/block}
 									</ul>
 								{/block}
-								{block name='room-type-tabs-content'}
+								{block name='room_type_tabs_content'}
 									<div class="tab-content product_description_tabs_contents">
-										{block name='room-type-info-tab-content'}
+										{block name='room_type_info_tab_content'}
 											<div id="product_info_tab" class="tab-pane active card">
 												<div id="product_info_tab_information">
 													<div class="row info_margin_div room_description">
@@ -340,7 +340,7 @@
 												</div>
 											</div>
 										{/block}
-										{block name='room-type-refund-policies-tab-content'}
+										{block name='room_type_refund_policies_tab_content'}
 											{* Block for booking products *}
 											{if isset($id_hotel) && $id_hotel}
 												<div id="refund_policies_tab" class="tab-pane card">
@@ -362,7 +362,7 @@
 												</div>
 											{/if}
 										{/block}
-										{block name='room-type-map-tab-content'}
+										{block name='room_type_map_tab_content'}
 											{if $display_google_maps && ($hotel_latitude|floatval != 0 && $hotel_longitude|floatval != 0)}
 												<div id="room_type_map_tab" class="tab-pane card">
 													<div class="map-wrap"></div>
@@ -396,10 +396,10 @@
 					</div> <!-- end pb-left-column -->
 				{/block}
 
-				{block name='room-type-right-column'}
+				{block name='room_type_right_column'}
 					<div class="pb-right-column col-xs-12 col-sm-4 col-md-4">
 						{if ($product->show_price && !isset($restricted_country_mode)) || isset($groups) || $product->reference || (isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS)}
-							{block name='room-type-hidden-fields'}
+							{block name='room_type_hidden_fields'}
 								<p class="hidden">
 									<input type="hidden" name="token" value="{$static_token}" />
 									<input type="hidden" name="id_product" value="{$product->id|intval}" id="product_page_product_id" />
@@ -410,7 +410,7 @@
 
 							{include file='./_partials/booking-form.tpl'}
 
-							{block name='room-type-demands'}
+							{block name='room_type_demands'}
 								{* extra room type demands *}
 								{if isset($room_type_demands) && $room_type_demands}
 									<div class="col-sm-12 card room_demands_container">
@@ -722,7 +722,7 @@
 			</div>
 		{/if}
 	</div> <!-- itemscope product wrapper -->
-	{block name='room-type-js-vars'}
+	{block name='room_type_js_vars'}
 		{strip}
 			{if isset($id_hotel) && $id_hotel}
 				{addJsDef id_hotels = $id_hotel}
diff --git a/themes/hotel-reservation-theme/shopping-cart-advanced.tpl b/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
index 56654b40e..8e666875c 100644
--- a/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart-advanced.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='shopping-cart-advanced'}
+{block name='shopping_cart_advanced'}
     <h2>{l s='Cart Summary'}</h2>
     {assign var='total_discounts_num' value="{if $total_discounts != 0}1{else}0{/if}"}
     {assign var='use_show_taxes' value="{if $use_taxes && $show_taxes}2{else}0{/if}"}
@@ -32,7 +32,7 @@
     {block name='displayBeforeShoppingCartBlock'}
         {hook h="displayBeforeShoppingCartBlock"}
     {/block}
-    {block name='shopping-cart-details'}
+    {block name='shopping_cart_details'}
         <div id="order-detail-content" class="table_block table-responsive">
             <table id="cart_summary" class="table table-bordered {if $PS_STOCK_MANAGEMENT}stock-management-on{else}stock-management-off{/if}">
                 <thead>
diff --git a/themes/hotel-reservation-theme/shopping-cart.tpl b/themes/hotel-reservation-theme/shopping-cart.tpl
index 2e53cbbfd..bb6d7e30d 100644
--- a/themes/hotel-reservation-theme/shopping-cart.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart.tpl
@@ -23,7 +23,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-{block name='shopping-cart'}
+{block name='shopping_cart'}
 	{capture name=path}{l s='Your shopping cart'}{/capture}
 
 	{* <h1 id="cart_title" class="page-heading">{l s='Shopping-cart summary'}
@@ -81,7 +81,7 @@
 			{hook h="displayBeforeShoppingCartBlock"}
 		{/block}
 
-		{block name='shopping-cart-details'}
+		{block name='shopping_cart_details'}
 			<div class="order-detail-content">
 				{if isset($cart_htl_data) && $cart_htl_data}
 					<p class="cart_section_title">{l s='rooms information'}</p>
@@ -432,7 +432,7 @@
 				<div id="HOOK_SHOPPING_CART_EXTRA">{if isset($HOOK_SHOPPING_CART_EXTRA)}{$HOOK_SHOPPING_CART_EXTRA}{/if}</div>
 			{/block}
 		</div>
-		{block name='shopping-cart-js-vars'}
+		{block name='shopping_cart_js_vars'}
 			{strip}
 				{addJsDef deliveryAddress=$cart->id_address_delivery|intval}
 				{addJsDefL name=txtProduct}{l s='product' js=1}{/addJsDefL}
@@ -442,7 +442,7 @@
 	{/if}
 
 	{* Fancybox for extra demands*}
-	{block name='shopping-cart-extra-services'}
+	{block name='shopping_cart_extra_services'}
 		<div style="display:none;" id="rooms_extra_services">
 			{* <div id="rooms_type_extra_services"> *}
 				{* <div class="panel">