diff --git a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
index 411afaaf6..74f1c2e79 100644
--- a/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl
@@ -44,7 +44,7 @@
 	{/if}
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{if $input.type == 'text_customer'}
 		{if isset($customer)}
 			<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
index 61eaa1de9..177b16734 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -33,7 +33,7 @@
 	{$smarty.block.parent}
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{if $input.name == 'current_texture'}
 		<div class="margin-form">
 			{if isset($imageTextureExists) && $imageTextureExists}
diff --git a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
index 35932ec44..7072c440d 100644
--- a/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes_groups/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.name == 'public_name'}
 		{hook h="displayAttributeGroupForm" id_attribute_group=$form_id}
diff --git a/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
index ed30d9b61..fadf161ac 100644
--- a/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carriers/helpers/form/form.tpl
@@ -41,7 +41,7 @@
 	{$smarty.block.parent}
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.type == 'select' && $input.name == 'range_behavior'}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
index bdb7fec65..9810121f8 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="description_block"}
+{block name="description"}
 	{$smarty.block.parent}
 	{if ($input.name == 'groupBox')}
 		<p class="hint" style="display:block; position:relative; display:inline-block;">
diff --git a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
index f7850e858..2c2468a2c 100644
--- a/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
@@ -66,7 +66,7 @@
 	</div>
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'select_category'}
 		<select name="{$input.name}">
 			{$input.options.html}
diff --git a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
index 44338b070..f18717841 100644
--- a/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cms_categories/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'select_category'}
 		<select name="id_parent">
 			{$input.options.html}
diff --git a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
index 397cb965e..2b21fa158 100644
--- a/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/countries/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="field_block"}
+{block name="field"}
 	{if $input.type == 'address_layout'}
 		<div class="margin-form">
 			<div style="float:left">
diff --git a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
index 23a7e1f3c..ee711e522 100644
--- a/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'select_theme'}
 		<select name="{$input.name}" id="{$input.name}" {if isset($input.multiple)}multiple="multiple" {/if}{if isset($input.onchange)}onchange="{$input.onchange}"{/if}>
 			{foreach $input.options.query AS $option}
diff --git a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
index 2bdf11472..2dc9c43df 100644
--- a/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/feature_value/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.name == 'id_feature'}
 		{hook h="displayFeatureValueForm" id_feature_value=$feature_value->id}
diff --git a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
index 0636bb1ee..dc62deb97 100644
--- a/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/features/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.name == 'name'}
 		{hook h="displayFeatureForm" id_feature=$form_id}
diff --git a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
index c5c24c0e8..0e52d4d8e 100644
--- a/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
@@ -43,7 +43,7 @@
 {/block}
 
 
-{block name="field_block"}
+{block name="field"}
 	{if $input['type'] == 'group_discount_category'}
 	<div style="{if !$form_id}display:none{/if}">
 		<script type="text/javascript">
diff --git a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
index 01e2133a6..ababcb1f3 100644
--- a/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/invoices/helpers/form/form.tpl
@@ -61,7 +61,7 @@
 
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'checkboxStatuses'}
 		{foreach $input.values.query as $value}
 			{assign var=id_checkbox value=$input.name|cat:'_'|cat:intval($value[$input.values.id])}
diff --git a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
index 555a2a175..21de53e04 100644
--- a/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/languages/helpers/form/form.tpl
@@ -25,7 +25,7 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'special'}
 		<div id="#resultCheckLangPack">
 			<p id="lang_pack_loading" style="display:none"><img src="../img/admin/{$input.img}" alt="" /> {$input.text}</p>
diff --git a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
index f0bb9713f..03d16e0c3 100644
--- a/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/performance/helpers/form/form.tpl
@@ -34,7 +34,7 @@
 	{/if}
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'radio' && $input.name == 'combination' && $input.disabled}
 		<div class="warn">
 			{l s='This feature can\'t be disabled because this is currently in use.'}
@@ -43,7 +43,7 @@
 	{$smarty.block.parent}
 {/block}
 
-{block name="description_block"}
+{block name="description"}
 	{$smarty.block.parent}
 	{if $input.type == 'radio' && $input.name == 'combination'}
 		<ul style="list-style-type:disc;margin:0 0 0 30px;">
@@ -60,7 +60,7 @@
 	{/if}
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.type == 'text' && $input.name == 'ps_cache_fs_directory_depth'}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
index 15b112b6d..2ac6d16d9 100644
--- a/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/referrers/helpers/form/form.tpl
@@ -101,7 +101,7 @@
 
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.name == 'request_uri_regexp_not'}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
index 083443c86..e3320d514 100644
--- a/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/return/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {extends file='helpers/form/form.tpl'}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'text_customer'}
 		{$customer->firstname} {$customer->lastname}
 		<p style="clear: both">
diff --git a/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl
index 91db85440..72f5ec648 100644
--- a/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/scenes/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="input_block"}
+{block name="input"}
 	{if ($input.type == "description")}
 		<p>{$input.text}</p>
 	{else}
diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
index 31791248a..3ae462600 100644
--- a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl
@@ -32,7 +32,7 @@
 	{$smarty.block.parent}
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'theme'}
 		{foreach $input.values as $theme}
 			<div class="select_theme {if $theme->id == $fields_value.id_theme_checked}select_theme_choice{/if}" onclick="$(this).find('input').attr('checked', true); $('.select_theme').removeClass('select_theme_choice'); $(this).toggleClass('select_theme_choice');">
diff --git a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
index 40105c96e..463432715 100644
--- a/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
@@ -32,7 +32,7 @@
 	{$smarty.block.parent}
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == "select_template"}
 		<div class="translatable">
 			{foreach $languages as $language}
@@ -65,7 +65,7 @@
 	{/if}
 {/block}
 
-{block name="field_block"}
+{block name="field"}
 	{$smarty.block.parent}
 	{if $input.type == "select_template"}
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
index f9ebd27fa..0ca23ec45 100644
--- a/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
@@ -33,7 +33,7 @@
 	});
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'latitude'}
 		<input type="text"
 			{if isset($input.size)}size="{$input.size}"{/if}
diff --git a/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
index 6c4fada21..5c949bb28 100644
--- a/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/webservice/helpers/form/form.tpl
@@ -25,14 +25,14 @@
 *}
 {extends file="helpers/form/form.tpl"}
 
-{block name="description_block"}
+{block name="description"}
 	{$smarty.block.parent}
 	{if $input.type == 'text' && $input.name == 'key'}
 		<input type="button" value="{l s='   Generate!   '}" class="button" onclick="gencode(32)" />
 	{/if}
 {/block}
 
-{block name="input_block"}
+{block name="input"}
 	{if $input.type == 'resources'}
 		<p>{l s='Set the resource permissions for this key:'}</p>
 		<table border="0" cellspacing="0" cellpadding="0" class="table accesses">
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index 77008b3e5..a0d4bc069 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -67,9 +67,9 @@
 							{block name="label"}
 								{if isset($input.label)}<label>{$input.label} </label>{/if}
 							{/block}
-							{block name="field_block"}
+							{block name="field"}
 								<div class="margin-form">
-								{block name="input_block"}
+								{block name="input"}
 								{if $input.type == 'text' || $input.type == 'tags'}
 									{if isset($input.lang)}
 										<div class="translatable">
@@ -324,7 +324,7 @@
 								{/if}
 								{if isset($input.required) && $input.required && $input.type != 'radio'} <sup>*</sup>{/if}
 								{/block}{* end block input *}
-								{block name="description_block"}
+								{block name="description"}
 									{if isset($input.desc)}
 										<p class="preference_description">
 											{if is_array($input.desc)}
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index c44750277..62d1e011d 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -111,7 +111,7 @@
 						{$tr.$key|escape:'htmlall':'UTF-8'}
 					{/if}
 				{else}
-					{block name="default_field_block"}--{/block}
+					{block name="default_field"}--{/block}
 				{/if}
 				{if isset($params.suffix)}{$params.suffix}{/if}
 				{if isset($params.color) && isset($tr.color)}
diff --git a/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl b/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl
index e1c489651..1d628f14c 100644
--- a/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/modules/blockcms/views/templates/admin/_configure/helpers/form/form.tpl
@@ -26,7 +26,7 @@
 
 {extends file="helpers/form/form.tpl"}
 
-{block name="input_block"}
+{block name="input"}
 
     {if $input.type == 'cms_blocks'}