diff --git a/base/src/org/compiere/util/WebEnv.java b/base/src/org/compiere/util/WebEnv.java
index 78d8f01d4d..bc7eea9784 100644
--- a/base/src/org/compiere/util/WebEnv.java
+++ b/base/src/org/compiere/util/WebEnv.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Product: Compiere ERP & CRM Smart Business Solution                        *
+ * Product: Adempiere ERP & CRM Smart Business Solution                        *
  * Copyright (C) 1999-2006 ComPiere, Inc. All Rights Reserved.                *
  * This program is free software; you can redistribute it and/or modify it    *
  * under the terms version 2 of the GNU General Public License as published   *
@@ -41,18 +41,18 @@ public class WebEnv
 	private static CLogger			log = CLogger.getCLogger(WebEnv.class);
 
 	/**
-	 *  Base Directory links <b>http://localhost:8080/compiere</b>
-	 *  to the physical <i>%COMPIERE_HOME%/tomcat/webroot/compiere</i> directory
+	 *  Base Directory links <b>http://localhost:8080/adempiere</b>
+	 *  to the physical <i>%adempiere_HOME%/tomcat/webroot/adempiere</i> directory
 	 */
 	public static final String   	DIR_BASE    = "/adempiere";      //  /adempiere
 	/** Image Sub-Directory under BASE          */
-	private static final String     DIR_IMAGE   = "images";         //  /compiere/images
+	private static final String     DIR_IMAGE   = "images";         //  /adempiere/images
 	/** Stylesheet Name                         */
 	private static final String     STYLE_STD   = "/css/standard.css";   //  /adempiere/standard.css
 	/** Small Logo. */
 	private static final String     LOGO        = "LogoSmall.gif";  //  /adempiere/LogoSmall.gif
 	/** Store Sub-Directory under BASE          */
-	private static final String     DIR_STORE   = "store";          //  /compiere/store
+	private static final String     DIR_STORE   = "store";          //  /adempiere/store
 
 	/**  Frame name for Commands - WCmd	*/
 	public static final String      TARGET_CMD  = "WCmd";
@@ -167,7 +167,7 @@ public class WebEnv
 	/**************************************************************************
 	 *  Get Base Directory entrry.
 	 *  <br>
-	 *  /compiere/
+	 *  /adempiere/
 	 *  @param entry file entry or path
 	 *  @return url to entry in base directory
 	 */
@@ -183,7 +183,7 @@ public class WebEnv
 	/**
 	 *  Get Image Directory entry.
 	 *  <br>
-	 *  /compiere/images
+	 *  /adempiere/images
 	 *  @param entry file entry or path
 	 *  @return url to entry in image directory
 	 */
@@ -200,7 +200,7 @@ public class WebEnv
 	/**
 	 *  Get Store Directory entry.
 	 *  <br>
-	 *  /compiere/store
+	 *  /adempiere/store
 	 *  @param entry file entry or path
 	 *  @return url to entry in store directory
 	 */
@@ -216,9 +216,8 @@ public class WebEnv
 
 	/**
 	 *  Get Logo Path.
-	 *	Removing/modifying the Compiere logo is a violation of the license
 	 *  <p>
-	 *  /compiere/LogoSmall.gif
+	 *  /adempiere/LogoSmall.gif
 	 *  @return url to logo
 	 */
 	public static String getLogoURL()
@@ -228,23 +227,18 @@ public class WebEnv
 
 	/**
 	 *  Get Logo Image HTML tag.
-	 *	Removing/modifying the Compiere logo or copyright notice is a violation of the license
 	 *  @return Image
 	 */
 	public static img getLogo()
 	{
-		/** Removing/modifying the Compiere logo is a violation of the license	*/
 		return new img(getLogoURL()).setAlign(AlignType.RIGHT)
-		//	Changing the copyright notice in any way violates the license 
-		//	and you'll be held liable for any damage claims
-			//.setAlt("&copy; Jorg Janke/Compiere");	
 			.setAlt("&copy; Jorg Janke/adempiere");	
 	}   //  getLogo
 
 	/**
 	 *  Get Stylesheet Path.
 	 *  <p>
-	 *  /compiere/standard.css
+	 *  /adempiere/standard.css
 	 *  @return url of Stylesheet
 	 */
 	public static String getStylesheetURL()