Index: branches/5.1.x/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -r12657 -r13188
--- branches/5.1.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 13188)
@@ -58,26 +58,26 @@
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="2">
-				<inp2:Field name="heading" as_label="1"/>
+				<inp2:Field name="Heading" as_label="1"/>
 	   		</td>
 	   		<td align="right">
-	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="heading"/>');" id="toggle_mark[<inp2:Field name="heading"/>]" title="Collapse/Expand Section">[-]</a>
+	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="Heading"/>');" id="toggle_mark[<inp2:Field name="Heading"/>]" title="Collapse/Expand Section">[-]</a>
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="Heading"/>">
 		<td style="width:500px;">
 			<inp2:Field name="VariableName" result_to_var="error_field"/>
 			<span class="<inp2:m_if check='HasError' field='$error_field' id_field='VariableName'>error-cell</inp2:m_if>">
-			<inp2:Field field="prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
+			<inp2:Field field="Prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
 
 			<inp2:m_if check="m_IsDebugMode">
 				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>
 		</td>
 
 		<td>
-			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>
+			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList"/>
 		</td>
 
 		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
@@ -89,30 +89,30 @@
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="2">
-	    		<inp2:Field name="heading" as_label="1"/>
+	    		<inp2:Field name="Heading" as_label="1"/>
 	   		</td>
 	   		<td align="right">
-	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="heading"/>');" id="toggle_mark[<inp2:Field name="heading"/>]" title="Collapse/Expand Section">[-]</a>
+	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="Heading"/>');" id="toggle_mark[<inp2:Field name="Heading"/>]" title="Collapse/Expand Section">[-]</a>
 	   		</td>
 		</tr>
 	</inp2:m_if>
-	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
+	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="Heading"/>">
 		<td>
 			<inp2:Field name="VariableName" result_to_var="error_field"/>
 			<span class="<inp2:m_if check='HasError' field='$error_field' id_field='VariableName'>error-cell</inp2:m_if>">
-			<inp2:Field field="prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
+			<inp2:Field field="Prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
 
 			<inp2:m_if check="m_IsDebugMode">
 				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>
 		</td>
 
 		<td>
-			<nobr><inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/>&nbsp;&nbsp;
+			<nobr><inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList"/>&nbsp;&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_block2">
-			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="element_type" value_list_field="ValueList"/></nobr>
+			<inp2:ConfigFormElement PrefixSpecial="$PrefixSpecial" field="VariableValue" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList"/></nobr>
 		</td>
 		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>