diff --git a/Templates/html_controls.html.ep.xml b/Templates/html_controls.html.ep.xml
index c061e21..0810039 100644
--- a/Templates/html_controls.html.ep.xml
+++ b/Templates/html_controls.html.ep.xml
@@ -75,7 +75,7 @@
 		</span>]]>
 	</Submit>
 	
-	<search><![CDATA[
+	<Search><![CDATA[
 		<p><span class=label>
 			%=l('${prefix}_${Label}')
 		</span><span class=data>
@@ -84,9 +84,9 @@
 			%=search_field '${Name}' , class => 'searc${type_serial}'
 		</span>span></p>
 		]]>
-	</search>
+	</Search>
 	
-	<url><![CDATA[
+	<Url><![CDATA[
 		<p><span class=label>
 			%=l('${Label}')
 		</span><span class=data>
@@ -94,9 +94,9 @@
 			%=URL_field '${Name}' , class => 'url${type_serial}'
 		</span>span></p>
 		]]>
-	</url>
+	</Url>
 
-	<tel><![CDATA[
+	<Tel><![CDATA[
 		<p><span class=label>
 			%=l('${Label}')
 		</span><span class=data>
@@ -104,7 +104,7 @@
 			%=tel_field '${Name}', class => 'tel${type_serial}'
 		</span>span></p>
 		]]>
-	</tel>
+	</Tel>
 
 	<Email><![CDATA[
 		<p><span class=label>
@@ -116,7 +116,7 @@
 		]]>
 	</Email>
 
-	<password><![CDATA[
+	<Password><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -124,9 +124,9 @@
 			%=password_field '${Name}', class => 'pass${type_serial}'
 		</span>span></p>
 		]]>
-	</password>
+	</Password>
 	
-	<timedate><![CDATA[
+	<Timedate><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -134,9 +134,9 @@
 			%=timedate_field '${Name}', class => 'time${type_serial}'
 		</span>span></p>
 		]]>
-	</timedate>
+	</Timedate>
 
-	<week><![CDATA[
+	<Week><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -144,9 +144,9 @@
 			%=week_field '${Name}', class => 'week${type_serial}'
 		</span>span></p>
 		]]>
-	</week>
+	</Week>
 
-	<month><![CDATA[
+	<Month><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -154,9 +154,9 @@
 			%=month_field '${Name}', class => 'mont${type_serial}'
 		</span>span></p>
 		]]>
-	</month>
+	</Month>
 	
-	<range><![CDATA[
+	<Range><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -164,9 +164,9 @@
 			%=range_field '${Name}', class => 'rang${type_serial}'
 		</span>span></p>
 		]]>
-	</range>
+	</Range>
 
-	<radio><![CDATA[
+	<Radio><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -174,9 +174,9 @@
 			%=radio_field '${Name}', class => 'radi${type_serial}'
 		</span>span></p>
 		]]>
-	</radio>
+	</Radio>
 
-	<number><![CDATA[
+	<Number><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -184,9 +184,9 @@
 			%=number_field '${Name}', class => 'numb${type_serial}'
 		</span>span></p>
 		]]>
-	</number>
+	</Number>
 
-	<file><![CDATA[
+	<File><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -194,9 +194,9 @@
 			%=file_field '${Name}', class => 'file${type_serial}'
 		</span>span></p>
 		]]>
-	</file>
+	</File>
 	
-	<color><![CDATA[
+	<Color><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -204,9 +204,9 @@
 			%=color_field '${Name}', class => 'colo${type_serial}'
 		</span>span></p>
 		]]>
-	</color>
+	</Color>
 	
-	<checkbox><![CDATA[
+	<Checkbox><![CDATA[
 		<p><span class='label'>
 			%=l('${Label}')
 		</span><span class=data>
@@ -214,7 +214,7 @@
 			%=checkbox_field '${Name}', class => 'chec${type_serial}'
 		</span>span></p>
 		]]>
-	</checkbox>
+	</Checkbox>
 
 	<Table><![CDATA[
 		<br /><table class="sme-border TableSort sme-table ${classname} ">