diff --git a/serverRoot/src/ear/application.xml b/serverRoot/src/ear/application.xml
index c91c186284..e2402f8bdd 100644
--- a/serverRoot/src/ear/application.xml
+++ b/serverRoot/src/ear/application.xml
@@ -3,7 +3,7 @@
              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_5.xsd"
              version="5">
-	<display-name>Adempiere</display-name>
+	<display-name>ADempiere</display-name>
 	<module>
 		<java>AdempiereSLib.jar</java>
 	</module>
diff --git a/serverRoot/src/web/WEB-INF/web.xml b/serverRoot/src/web/WEB-INF/web.xml
index 1a2841df1e..301baa1e4c 100644
--- a/serverRoot/src/web/WEB-INF/web.xml
+++ b/serverRoot/src/web/WEB-INF/web.xml
@@ -4,14 +4,14 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
    version="2.4">
-	<display-name>Adempiere Root</display-name>
-	<description>$Id: web.xml,v 1.1 2006/04/21 18:04:14 jjanke Exp $</description>
+	<display-name>ADempiere Root</display-name>
+	<description></description>
 	<context-param>
 		<param-name>ServerRoot</param-name>
 		<param-value>1</param-value>
 	</context-param>
 	<filter>
-		<display-name>Adempiere Monitor Filter</display-name>
+		<display-name>ADempiere Monitor Filter</display-name>
 		<filter-name>AdempiereMonitorFilter</filter-name>
 		<filter-class>org.compiere.web.AdempiereMonitorFilter</filter-class>
 	</filter>
@@ -30,14 +30,14 @@
 		<load-on-startup>1</load-on-startup>
 	</servlet>
 	<servlet>
-		<description>Adempiere Server Status Info</description>
+		<description>ADempiere Server Status Info</description>
 		<display-name>Server Status</display-name>
 		<servlet-name>StatusInfo</servlet-name>
 		<servlet-class>org.compiere.web.StatusInfo</servlet-class>
 	</servlet>
 	<servlet>
-		<description>Adempiere Server Monitor</description>
-		<display-name>Adempiere Monitor</display-name>
+		<description>ADempiere Server Monitor</description>
+		<display-name>ADempiere Monitor</display-name>
 		<servlet-name>AdempiereMonitor</servlet-name>
 		<servlet-class>org.compiere.web.AdempiereMonitor</servlet-class>
 		<load-on-startup>1</load-on-startup>
diff --git a/serverRoot/src/web/applet.html b/serverRoot/src/web/applet.html
index 2173c13967..a8e6c377af 100644
--- a/serverRoot/src/web/applet.html
+++ b/serverRoot/src/web/applet.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Adempiere Client Applet Start</title>
+<title>ADempiere Client Applet Start</title>
 <link href="standard.css" rel="stylesheet" type="text/css" />
 <style type="text/css">
 <!--
@@ -14,12 +14,12 @@
 </style>
 </head>
 <body>
-<h1>Adempiere Client Applet Start</h1>
+<h1>ADempiere Client Applet Start</h1>
 <p> Due to Browser incompatibilities, here is a list of different ways to start the Adempiere Java Client from a Browser. 
 This requires that your browser supports Java. <br/>
 <a href="http://java.sun.com/j2se/1.5.0/docs/guide/plugin/developer_guide/using_tags.html" target="_blank">Applet Start Details</a> 
 </p>
-<p class="warning">After the Adempiere Client started DO NOT close/use this window as that will crash the application!</p>
+<p class="warning">After the ADempiere Client started DO NOT close/use this window as that will crash the application!</p>
 <table width="*"  border="1" cellspacing="5" cellpadding="5">
   <tr>
     <td> Microsoft IE <br />
diff --git a/serverRoot/src/web/error.html b/serverRoot/src/web/error.html
index da01ce500d..1b64ae59a4 100644
--- a/serverRoot/src/web/error.html
+++ b/serverRoot/src/web/error.html
@@ -2,12 +2,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Adempiere Server Error</title>
+<title>ADempiere Server Error</title>
 <link href="/standard.css" rel="stylesheet"/>
 </head>
 <body>
-<h1>Adempiere Server Error </h1>
-<p>The Adempiere Server encountered a unrecoverable error.</p>
+<h1>ADempiere Server Error </h1>
+<p>The ADempiere Server encountered a unrecoverable error.</p>
 <h2>Please notify the administrator.</h2>
 </body>
 </html>
diff --git a/serverRoot/src/web/index.html b/serverRoot/src/web/index.html
index ef74245cae..de6ee62fb9 100644
--- a/serverRoot/src/web/index.html
+++ b/serverRoot/src/web/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>Adempiere</title>
+	<title>ADempiere</title>
 	<meta name="description" content="Adempiere Root Page">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 </head>
