From 19a62026289f36733204648f32bd6ce557b2f305 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 20 Apr 2017 02:10:33 +0200
Subject: [PATCH] renaming this was a bad idea anyway ... let's keep it generic
 as "USER"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 .../beans/helper/PizzaWebRequestHelper.java   |  4 +--
 web/WEB-INF/templates/admin/admin_menu.tpl    |  2 +-
 .../admin/customer/admin_customer_links.tpl   | 10 +++----
 .../admin_form_customer_personal_data.tpl     |  2 +-
 .../guest/user/guest_registration_form.tpl    |  2 +-
 .../customer/admin_customer_delete.xhtml      |  6 ++--
 web/admin/customer/admin_customer_edit.xhtml  | 14 ++++-----
 web/admin/customer/admin_customer_list.xhtml  | 28 ++++++++---------
 web/admin/customer/admin_customer_show.xhtml  | 30 +++++++++----------
 .../customer/admin_customer_unlock.xhtml      |  4 +--
 web/customer/checkout.xhtml                   |  6 ++--
 web/customer/checkout_done.xhtml              |  4 +--
 web/customer/empty_basket.xhtml               |  4 +--
 13 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java
index c7ae4c30..f2857f9a 100644
--- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java
@@ -215,13 +215,13 @@ public class PizzaWebRequestHelper implements PizzaWebRequestController {
 		// Check user first
 		if (isUserContact && isCustomerContact) {
 			// Is both
-			messageKey = "CONTACT_IS_USER_CUSTOMER"; //NOI18N
+			messageKey = "CONTACT_IS_USER_USER"; //NOI18N
 		} else if (isUserContact) {
 			// Only user
 			messageKey = "CONTACT_IS_USER"; //NOI18N
 		} else if (isCustomerContact) {
 			// Only customer
-			messageKey = "CONTACT_IS_CUSTOMER"; //NOI18N
+			messageKey = "CONTACT_IS_USER"; //NOI18N
 		}
 
 		// Return message key
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 03c3d5f3..d4387c05 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -21,7 +21,7 @@
 			</div>
 
 			<ul>
-				<li><h:link title="#{msg.LINK_ADMIN_LIST_CUSTOMER_TITLE}" outcome="admin_list_customer" value="#{msg.LINK_ADMIN_LIST_CUSTOMER}" /></li>
+				<li><h:link title="#{msg.LINK_ADMIN_LIST_USER_TITLE}" outcome="admin_list_customer" value="#{msg.LINK_ADMIN_LIST_USER}" /></li>
 			</ul>
 
 			<div class="menu_header">
diff --git a/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl b/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl
index d9ddb6f6..b183f79a 100644
--- a/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl
+++ b/web/WEB-INF/templates/admin/customer/admin_customer_links.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_CUSTOMER_NOT_SET}" rendered="#{empty customer}" />
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty customer}" />
 
 	<ui:fragment rendered="#{not empty customer}">
 		<div class="table">
@@ -16,7 +16,7 @@
 			<div class="table_row">
 				<ul>
 					<li>
-						<h:link outcome="admin_edit_customer" value="#{msg.ADMIN_LINK_EDIT_CUSTOMER}" title="#{msg.ADMIN_LINK_EDIT_CUSTOMER_TITLE}">
+						<h:link outcome="admin_edit_customer" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
 							<f:param name="customerId" value="#{customer.customerId}" />
 						</h:link>
 					</li>
@@ -28,14 +28,14 @@
 					</li>
 
 					<li>
-						<h:link outcome="admin_unlock_customer" value="#{msg.ADMIN_LINK_UNLOCK_CUSTOMER}" title="#{msg.ADMIN_LINK_UNLOCK_CUSTOMER_TITLE}">
+						<h:link outcome="admin_unlock_customer" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}">
 							<f:param name="customerId" value="#{customer.customerId}" />
 						</h:link>
 					</li>
 
 					<li>
-						<h:link outcome="admin_delete_customer" title="#{msg.ADMIN_LINK_DELETE_CUSTOMER_TITLE}">
-							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CUSTOMER}" />
+						<h:link outcome="admin_delete_customer" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
+							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
 							<f:param name="customerId" value="#{customer.customerId}" />
 						</h:link>
 					</li>
diff --git a/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
index 611bc729..54d737c3 100644
--- a/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
+++ b/web/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="para notice">
-		<h:outputText value="#{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+		<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 	</div>
 
 	<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
diff --git a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
index e8d70a76..794e5370 100644
--- a/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_registration_form.tpl
@@ -82,7 +82,7 @@
 					<div class="para notice">
 						<ul>
 							<li>#{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}</li>
-							<li>#{msg.GUEST_REGISTRATION_CUSTOMER_NUMBER_NOTICE}</li>
+							<li>#{msg.GUEST_REGISTRATION_USER_NUMBER_NOTICE}</li>
 						</ul>
 					</div>
 				</fieldset>
diff --git a/web/admin/customer/admin_customer_delete.xhtml b/web/admin/customer/admin_customer_delete.xhtml
index 82486e52..a42cab4e 100644
--- a/web/admin/customer/admin_customer_delete.xhtml
+++ b/web/admin/customer/admin_customer_delete.xhtml
@@ -9,17 +9,17 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CUSTOMER_ID_NOT_SET}" />
+		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
 		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CUSTOMER}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CUSTOMER}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/customer/admin_customer_edit.xhtml b/web/admin/customer/admin_customer_edit.xhtml
index 1bba6ec7..c7c6d802 100644
--- a/web/admin/customer/admin_customer_edit.xhtml
+++ b/web/admin/customer/admin_customer_edit.xhtml
@@ -9,30 +9,30 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CUSTOMER_ID_NOT_SET}" />
+		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
 		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CUSTOMER}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CUSTOMER}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CUSTOMER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
 
 			<h:form id="form_admin_edit_customer" rendered="#{not empty adminHelper.customer}">
 				<div class="table">
 					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_EDIT_CUSTOMER_TITLE}" />
+						<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
 					</div>
 
 					<div class="para notice">
-						<h:outputText value="#{msg.ADMIN_CUSTOMER_PERSONAL_DATA_MINIMUM_NOTICE}" />
+						<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_data.tpl">
@@ -41,7 +41,7 @@
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="admin_edit_customer" value="#{msg.BUTTON_ADMIN_EDIT_CUSTOMER}" action="#{adminCustomerController.editCustomerData()}" />
+						<h:commandButton class="submit" type="submit" id="admin_edit_customer" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminCustomerController.editCustomerData()}" />
 					</div>
 				</div>
 			</h:form>
diff --git a/web/admin/customer/admin_customer_list.xhtml b/web/admin/customer/admin_customer_list.xhtml
index 0211a4d5..91d0bdc8 100644
--- a/web/admin/customer/admin_customer_list.xhtml
+++ b/web/admin/customer/admin_customer_list.xhtml
@@ -10,28 +10,28 @@
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CUSTOMER}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CUSTOMER}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
-			<h:dataTable id="table_list_customers" var="customer" value="#{customerController.allCustomers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CUSTOMER}" rendered="#{customerController.hasCustomers()}">
+			<h:dataTable id="table_list_customers" var="customer" value="#{customerController.allCustomers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER}" rendered="#{customerController.hasCustomers()}">
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_CUSTOMER_ID}" />
+						<h:outputText value="#{msg.ADMIN_USER_ID}" />
 					</f:facet>
 
-					<h:link outcome="admin_show_customer" title="#{msg.ADMIN_LINK_SHOW_CUSTOMER_TITLE}" value="#{customer.customerId}">
+					<h:link outcome="admin_show_customer" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{customer.customerId}">
 						<f:param name="customerId" value="#{customer.customerId}" />
 					</h:link>
 				</h:column>
 
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_CUSTOMER_NUMBER}" />
+						<h:outputText value="#{msg.ADMIN_USER_NUMBER}" />
 					</f:facet>
 
 					<h:outputText value="#{customer.customerNumber}" />
@@ -63,7 +63,7 @@
 
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}" />
+						<h:outputText value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 					</f:facet>
 
 					<h:outputText styleClass="#{customer.customerAccountStatus.styleClass}" value="#{msg[customer.customerAccountStatus.messageKey]}" />
@@ -71,7 +71,7 @@
 
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{msg.ADMIN_CUSTOMER_CREATED}" />
+						<h:outputText value="#{msg.ADMIN_USER_CREATED}" />
 					</f:facet>
 
 					<h:outputText id="customerCreated" value="#{customer.customerCreated.time}">
@@ -83,18 +83,18 @@
 			<div class="table_medium">
 				<h:form id="form_admin_add_customer">
 					<div class="table_header">
-						<h:outputText value="#{msg.ADMIN_ADD_CUSTOMER_TITLE}" />
+						<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 					</div>
 
 					<div class="para">
 						<fieldset id="customer_contact">
-							<legend title="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND_TITLE}">
-								<h:outputText value="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT_LEGEND}" />
+							<legend title="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND_TITLE}">
+								<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
 							</legend>
 
 							<div class="table_row">
 								<div class="table_left_medium">
-									<h:outputLabel for="customerContact" value="#{msg.ADMIN_SELECT_CUSTOMER_CONTACT}" />
+									<h:outputLabel for="customerContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
 								</div>
 
 								<div class="table_right_medium">
@@ -110,14 +110,14 @@
 					</div>
 
 					<div class="para">
-						<h:outputText value="#{msg.ADMIN_ADD_CUSTOMER_OR_ENTER_CONTACT_DATA}" />
+						<h:outputText value="#{msg.ADMIN_ADD_USER_OR_ENTER_CONTACT_DATA}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/customer/admin_form_customer_personal_data.tpl" />
 
 					<div class="table_footer">
 						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="add" value="#{msg.BUTTON_ADMIN_ADD_CUSTOMER}" action="#{adminCustomerController.addCustomer()}" />
+						<h:commandButton class="submit" type="submit" id="add" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminCustomerController.addCustomer()}" />
 					</div>
 				</h:form>
 			</div>
diff --git a/web/admin/customer/admin_customer_show.xhtml b/web/admin/customer/admin_customer_show.xhtml
index 6ac86c02..68a1e362 100644
--- a/web/admin/customer/admin_customer_show.xhtml
+++ b/web/admin/customer/admin_customer_show.xhtml
@@ -9,43 +9,43 @@
 	>
 
 	<f:metadata>
-		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CUSTOMER_ID_NOT_SET}" />
+		<f:viewParam name="customerId" value="#{adminHelper.customer}" converter="CustomerConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
 		<f:viewAction action="#{adminHelper.copyCustomerToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CUSTOMER}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CUSTOMER}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CUSTOMER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty adminHelper.customer}" />
 
-			<h:panelGrid id="customer_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CUSTOMER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.customer}">
+			<h:panelGrid id="customer_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty adminHelper.customer}">
 				<f:facet name="header">
-					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CUSTOMER}">
+					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
 						<f:param value="#{adminHelper.customer.customerId}" />
 					</h:outputFormat>
 				</f:facet>
 
 				<h:column>
-					<h:outputLabel for="customerId" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_ID}" />
+					<h:outputLabel for="customerId" styleClass="data_label" value="#{msg.ADMIN_USER_ID}" />
 
 					<h:outputText id="customerId" styleClass="data_field" value="#{adminHelper.customer.customerId}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerName" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_NUMBER}" />
+					<h:outputLabel for="customerName" styleClass="data_label" value="#{msg.ADMIN_USER_NUMBER}" />
 
 					<h:outputText id="customerName" styleClass="data_field" value="#{adminHelper.customer.customerNumber}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerCreated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CREATED}" />
+					<h:outputLabel for="customerCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CREATED}" />
 
 					<h:outputText id="customerCreated" styleClass="data_field" value="#{adminHelper.customer.customerCreated.time}">
 						<f:convertDateTime for="customerCreated" type="both" />
@@ -53,7 +53,7 @@
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerUpdated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_UPDATED}" />
+					<h:outputLabel for="customerUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_UPDATED}" />
 
 					<h:outputText id="customerUpdated" styleClass="data_field" value="#{adminHelper.customer.customerUpdated.time}">
 						<f:convertDateTime for="customerUpdated" type="both" />
@@ -61,13 +61,13 @@
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerAccountStatus" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_ACCOUNT_STATUS}" />
+					<h:outputLabel for="customerAccountStatus" styleClass="data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
 					<h:outputText id="customerAccountStatus" styleClass="data_field #{adminHelper.customer.customerAccountStatus.styleClass}" value="#{msg[adminHelper.customer.customerAccountStatus.messageKey]}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerLastLocked" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_LAST_LOCKED}" />
+					<h:outputLabel for="customerLastLocked" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
 					<h:outputText id="customerLastLocked" styleClass="data_field" value="#{adminHelper.customer.customerLastLocked.time}">
 						<f:convertDateTime for="customerLastLocked" type="both" />
@@ -75,13 +75,13 @@
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="customerLastLockedReason" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_LAST_LOCKED_REASON}" />
+					<h:outputLabel for="customerLastLockedReason" styleClass="data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
 					<h:outputText id="customerLastLockedReason" styleClass="data_field" value="#{adminHelper.customer.customerLastLockedReason}" />
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CONTACT_CREATED}" />
+					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_CREATED}" />
 
 					<h:outputText id="contactCreated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactCreated.time}">
 						<f:convertDateTime for="contactCreated" type="both" />
@@ -89,7 +89,7 @@
 				</h:column>
 
 				<h:column>
-					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_CUSTOMER_CONTACT_UPDATED}" />
+					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_USER_CONTACT_UPDATED}" />
 
 					<h:outputText id="contactUpdated" styleClass="data_field" value="#{adminHelper.customer.customerContact.contactUpdated.time}">
 						<f:convertDateTime for="contactUpdated" type="both" />
diff --git a/web/admin/customer/admin_customer_unlock.xhtml b/web/admin/customer/admin_customer_unlock.xhtml
index 167384ce..b1ca2e70 100644
--- a/web/admin/customer/admin_customer_unlock.xhtml
+++ b/web/admin/customer/admin_customer_unlock.xhtml
@@ -10,11 +10,11 @@
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
 		<ui:define name="admin_title">
-			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_CUSTOMER}" />
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_CUSTOMER}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/customer/checkout.xhtml b/web/customer/checkout.xhtml
index 129ba3fc..fa95d5db 100644
--- a/web/customer/checkout.xhtml
+++ b/web/customer/checkout.xhtml
@@ -10,11 +10,11 @@
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT}" />
+			<h:outputText value="#{msg.PAGE_TITLE_USER_CHECKOUT}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_CHECKOUT}" />
 		</ui:define>
 
 		<ui:define name="content">
@@ -26,7 +26,7 @@
 
 			<div class="checkout_outer">
 				<div class="checkout_title">
-					<h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT}" />
+					<h:outputText value="#{msg.CONTENT_TITLE_USER_CHECKOUT}" />
 				</div>
 
 				<div class="checkout_options">
diff --git a/web/customer/checkout_done.xhtml b/web/customer/checkout_done.xhtml
index 098e59d3..16565893 100644
--- a/web/customer/checkout_done.xhtml
+++ b/web/customer/checkout_done.xhtml
@@ -10,11 +10,11 @@
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_CHECKOUT_DONE}" />
+			<h:outputText value="#{msg.PAGE_TITLE_USER_CHECKOUT_DONE}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_CHECKOUT_DONE}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_CHECKOUT_DONE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/customer/empty_basket.xhtml b/web/customer/empty_basket.xhtml
index fd61bed8..0e9c5cc7 100644
--- a/web/customer/empty_basket.xhtml
+++ b/web/customer/empty_basket.xhtml
@@ -9,11 +9,11 @@
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
 		<ui:define name="guest_title">
-			<h:outputText value="#{msg.PAGE_TITLE_CUSTOMER_EMPTY_BASKET}" />
+			<h:outputText value="#{msg.PAGE_TITLE_USER_EMPTY_BASKET}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			<h:outputText value="#{msg.CONTENT_TITLE_CUSTOMER_EMPTY_BASKET}" />
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_EMPTY_BASKET}" />
 		</ui:define>
 
 		<ui:define name="content">
-- 
2.39.5