Index: branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl
===================================================================
diff -u -N -r14274 -r14720
--- branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(.../form_register.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/content_boxes/checkout/form_register.elm.tpl	(.../form_register.elm.tpl)	(revision 14720)
@@ -5,49 +5,49 @@
 
 	<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
 
-	<inp2:ord_PrefillRegistrationFields type="billing"/>
-	<inp2:m_if check="u_HasError" field="any">
+	<inp2:u.register_FormName name="registration"/>
+	<inp2:ord_PrefillRegistrationFields user_prefix="u.register" type="billing"/>
+	<inp2:m_if check="u.register_HasError" field="any">
 		<inp2:m_RenderElement name="error_message" />
 	</inp2:m_if>
 
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
+	<img src="<inp2:m_TemplatesBase module='In-Portal'/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 
 	<form method="post" action="<inp2:m_FormAction/>">
 		<table class="form-data fullwidth">
-			<inp2:m_if check="u_UseUsernames">
-				<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Login" title="lu_fld_Login" style="width:155px" />
-			</inp2:m_if>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Username" title="lu_fld_Login" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Email" title="lu_fld_Email" style="width:155px" />
 
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Email" title="lu_fld_Email" style="width:155px" />
-
 			<inp2:m_if check="m_ConfigEquals" name="User_Password_Auto" value="0">
-				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="Password" title="lu_fld_Password" style="width:155px" />
-				<inp2:m_RenderElement name="inp_edit_password" prefix="u" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="Password" title="lu_fld_Password" style="width:155px" />
+				<inp2:m_RenderElement name="inp_edit_password" prefix="u.register" field="VerifyPassword" title="lu_fld_VerifyPassword" style="width:155px" />
 			</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_date" prefix="u" field="dob" title="lu_fld_BirthDate" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="LastName" title="lu_fld_LastName" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Company" title="lu_fld_Company" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="City" title="lu_fld_City" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="State" title="lu_fld_State" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Zip" title="lu_fld_Zip" style="width:55px" />
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u" field="Country" title="lu_fld_Country" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Phone" title="lu_fld_Phone" style="width:155px" />
-			<inp2:m_RenderElement name="inp_edit_box" prefix="u" field="Fax" title="lu_fld_Fax" style="width:155px" is_last="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="FirstName" title="lu_fld_FirstName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="LastName" title="lu_fld_LastName" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Company" title="lu_fld_Company" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone" title="lu_fld_Phone" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Fax" title="lu_fld_Fax" style="width:155px"/>
 
+			<inp2:m_RenderElement name="inp_edit_date" prefix="u.register" field="dob" title="lu_fld_BirthDate" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street" title="lu_fld_AddressLine1" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Street2" title="lu_fld_AddressLine2" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City" title="lu_fld_City" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="State" title="lu_fld_State" style="width:155px" />
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" title="lu_fld_Zip" style="width:55px" />
+			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" title="lu_fld_Country" has_empty="1" is_last="1"/>
+			
+
 			<inp2:m_RenderElement design="inp_edit_buttons">
-				<input type="hidden" name="next_template" value="<inp2:m_get var="next_template"/>">
+				<input type="hidden" name="next_template" value="<inp2:m_get var='next_template'/>">
 				<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm">
 				<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending">
 
 				<input type="hidden" name="fields_prefilled" value="1" />
 
-				<input class="button" type="submit" id="events[u][OnCreate]" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
+				<input class="button" type="submit" id="events[u.register][OnCreate]" name="events[u.register][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register" no_editing="1"/>"/>
 				<input type="hidden" name="cancel_template" value="in-commerce/checkout/shop_cart" />
-				<input type="submit" class="button" name="events[ls][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
+				<input type="submit" class="button" name="events[u.register][OnCancel]" value="<inp2:m_Phrase label="lu_btn_Cancel" />" no_editing="1"/>
 			</inp2:m_RenderElement>
 		</table>
 	</form>