diff --git a/admin/inc/class.boaccess_history.inc.php b/admin/inc/class.boaccess_history.inc.php
index fb403443f1..1e30bc4543 100644
--- a/admin/inc/class.boaccess_history.inc.php
+++ b/admin/inc/class.boaccess_history.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index c67ff6f6c4..c599979ea2 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - account administration                                    *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - account administration                                      *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.boaclmanager.inc.php b/admin/inc/class.boaclmanager.inc.php
index 6d2fc6dbff..3d9c11aa30 100644
--- a/admin/inc/class.boaclmanager.inc.php
+++ b/admin/inc/class.boaclmanager.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.boapplications.inc.php b/admin/inc/class.boapplications.inc.php
index 8b46b13954..abfcb6bc23 100644
--- a/admin/inc/class.boapplications.inc.php
+++ b/admin/inc/class.boapplications.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - administration                                            *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - administration                                              *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.bocategories.inc.php b/admin/inc/class.bocategories.inc.php
index b5fc2f4a7c..f669d1f9fa 100644
--- a/admin/inc/class.bocategories.inc.php
+++ b/admin/inc/class.bocategories.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Admin - Global categories                                 *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Admin - Global categories                                   *
+	* http://www.egroupware.org                                                *
 	* Written by Bettina Gille [ceb@phpgroupware.org]                          *
 	* -----------------------------------------------                          *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/class.boconfig.inc.php b/admin/inc/class.boconfig.inc.php
index 52ec89244a..f048ccf3a6 100644
--- a/admin/inc/class.boconfig.inc.php
+++ b/admin/inc/class.boconfig.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - configuration administration                              *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - configuration administration                                *
+	* http://www.egroupware.org                                                *
 	* Copyright (C) 2001 Loic Dachary                                          *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/class.bocurrentsessions.inc.php b/admin/inc/class.bocurrentsessions.inc.php
index 22a17ae785..67a5c88ebe 100644
--- a/admin/inc/class.bocurrentsessions.inc.php
+++ b/admin/inc/class.bocurrentsessions.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	*  This file written by Joseph Engo <jengo@phpgroupware.org>               *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/class.bolog.inc.php b/admin/inc/class.bolog.inc.php
index 75d44e3d59..3be8b7dc7b 100755
--- a/admin/inc/class.bolog.inc.php
+++ b/admin/inc/class.bolog.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/***************************************************************************\
-	* phpGroupWare - log                                                        *
-	* http://www.phpgroupware.org                                               *
+	* eGroupWare - log                                                          *
+	* http://www.egroupware.org                                                 *
 	* Written by : Jerry Westrick [jerry@westrick.com]                          *
 	* -------------------------------------------------                         *
 	* This program is free software; you can redistribute it and/or modify it   *
diff --git a/admin/inc/class.boserver.inc.php b/admin/inc/class.boserver.inc.php
index 3ba121571a..8ea99aa1ba 100644
--- a/admin/inc/class.boserver.inc.php
+++ b/admin/inc/class.boserver.inc.php
@@ -1,8 +1,8 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Admin                                                     *
-  * http://www.phpgroupware.org                                              *
-  * Written by Miles Lott <milosch@phpgroupware.org>                         *
+  * eGroupWare - Admin                                                       *
+  * http://www.egroupware.org                                                *
+  * Written by Miles Lott <milosch@phpwhere.org>                             *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.html.inc.php b/admin/inc/class.html.inc.php
index a43782bb92..4571ab2a48 100755
--- a/admin/inc/class.html.inc.php
+++ b/admin/inc/class.html.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - html                                                      *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - html                                                        *
+	* http://www.egroupware.org                                                *
 	* Written by Jerry Westrick <jerry@westrick.com>                           *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/class.soaccess_history.inc.php b/admin/inc/class.soaccess_history.inc.php
index d6872d6c12..a43714f15c 100644
--- a/admin/inc/class.soaccess_history.inc.php
+++ b/admin/inc/class.soaccess_history.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.soaccounts.inc.php b/admin/inc/class.soaccounts.inc.php
index 1aa86f73b6..e893c92f85 100755
--- a/admin/inc/class.soaccounts.inc.php
+++ b/admin/inc/class.soaccounts.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - account administration                                    *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - account administration                                      *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.soapplications.inc.php b/admin/inc/class.soapplications.inc.php
index 8c4014856b..4ae978723f 100644
--- a/admin/inc/class.soapplications.inc.php
+++ b/admin/inc/class.soapplications.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - administration                                            *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - administration                                              *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.solog.inc.php b/admin/inc/class.solog.inc.php
index 95d12fad40..d1202c97e2 100755
--- a/admin/inc/class.solog.inc.php
+++ b/admin/inc/class.solog.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - solog                                                     *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - solog                                                       *
+	* http://www.egroupware.org                                                *
 	* This application written by Jerry Westrick <jerry@westrick.com>          *
 	* --------------------------------------------                             *
 	* Funding for this program was provided by http://www.checkwithmom.com     *
diff --git a/admin/inc/class.soserver.inc.php b/admin/inc/class.soserver.inc.php
index e065fd5eaa..bfc390df30 100644
--- a/admin/inc/class.soserver.inc.php
+++ b/admin/inc/class.soserver.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Admin - Peer Servers                                      *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Admin - Peer Servers                                        *
+  * http://www.egroupware.org                                                *
   * Written by Joseph Engo <jengo@mail.com>                                  *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/class.uiaccess_history.inc.php b/admin/inc/class.uiaccess_history.inc.php
index e9ed137b01..dc4f12d5ad 100644
--- a/admin/inc/class.uiaccess_history.inc.php
+++ b/admin/inc/class.uiaccess_history.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index b0e455cc5f..812225f5c4 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - account administration                                    *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - account administration                                      *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uiaclmanager.inc.php b/admin/inc/class.uiaclmanager.inc.php
index 499968bb70..f6cdc51832 100644
--- a/admin/inc/class.uiaclmanager.inc.php
+++ b/admin/inc/class.uiaclmanager.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uiapplications.inc.php b/admin/inc/class.uiapplications.inc.php
index 4b594da207..4aa754c5ea 100644
--- a/admin/inc/class.uiapplications.inc.php
+++ b/admin/inc/class.uiapplications.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - administration                                            *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - administration                                              *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uiasyncservice.inc.php b/admin/inc/class.uiasyncservice.inc.php
index 0e32ea327f..59d052d700 100644
--- a/admin/inc/class.uiasyncservice.inc.php
+++ b/admin/inc/class.uiasyncservice.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare Admin - Timed Asynchron Services for phpGroupWare           *
+	* eGroupWare Admin - Timed Asynchron Services for eGroupWare               *
 	* Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
-	* Class to admin cron-job like timed calls of phpGroupWare methods         *
+	* Class to admin cron-job like timed calls of eGroupWare methods           *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/                                             *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/                                               *
 	* ------------------------------------------------------------------------ *
 	* This library is free software; you can redistribute it and/or modify it  *
 	* under the terms of the GNU Lesser General Public License as published by *
diff --git a/admin/inc/class.uicategories.inc.php b/admin/inc/class.uicategories.inc.php
index 5b74b2a307..b6ca90cfba 100644
--- a/admin/inc/class.uicategories.inc.php
+++ b/admin/inc/class.uicategories.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Admin - Global categories                                 *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - Admin - Global categories                                   *
+	* http://www.egroupware.org                                                *
 	* Written by Bettina Gille [ceb@phpgroupware.org]                          *
 	* -----------------------------------------------                          *
 	* Copyright 2000 - 2003 Free Software Foundation, Inc                      *
diff --git a/admin/inc/class.uiconfig.inc.php b/admin/inc/class.uiconfig.inc.php
index dd8bd8682a..410fe79ca9 100644
--- a/admin/inc/class.uiconfig.inc.php
+++ b/admin/inc/class.uiconfig.inc.php
@@ -1,8 +1,8 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Admin config                                              *
-  * Written by Miles Lott <milosch@phpgroupware.org>                         *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Admin config                                                *
+  * Written by Miles Lott <milosch@phpwhere.org>                             *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uimainscreen.inc.php b/admin/inc/class.uimainscreen.inc.php
index 52b2570a71..29ee25135e 100644
--- a/admin/inc/class.uimainscreen.inc.php
+++ b/admin/inc/class.uimainscreen.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - administration                                            *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - administration                                              *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uimenuclass.inc.php b/admin/inc/class.uimenuclass.inc.php
index 87bf0be114..e6819f71ef 100644
--- a/admin/inc/class.uimenuclass.inc.php
+++ b/admin/inc/class.uimenuclass.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Administration                                            *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Administration                                              *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/class.uiserver.inc.php b/admin/inc/class.uiserver.inc.php
index 1826456457..f044013eda 100644
--- a/admin/inc/class.uiserver.inc.php
+++ b/admin/inc/class.uiserver.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - phpgroupware Peer Servers                                 *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - phpgroupware Peer Servers                                   *
+  * http://www.egroupware.org                                                *
   * -----------------------------------------------                          *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/hook_acl_manager.inc.php b/admin/inc/hook_acl_manager.inc.php
index 99db33bfb6..865f851afd 100644
--- a/admin/inc/hook_acl_manager.inc.php
+++ b/admin/inc/hook_acl_manager.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare                                                               *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/hook_admin.inc.php b/admin/inc/hook_admin.inc.php
index 0941162657..0a47bb9a4a 100644
--- a/admin/inc/hook_admin.inc.php
+++ b/admin/inc/hook_admin.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - administration                                            *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - administration                                              *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/hook_after_navbar.inc.php b/admin/inc/hook_after_navbar.inc.php
index dbd907a18b..e038e32953 100644
--- a/admin/inc/hook_after_navbar.inc.php
+++ b/admin/inc/hook_after_navbar.inc.php
@@ -1,8 +1,8 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - Admin                                                     *
-	* http://www.phpgroupware.org                                              *
-	* This application written by Miles Lott <milosch@phpgroupware.org>        *
+	* eGroupWare - Admin                                                       *
+	* http://www.egroupware.org                                                *
+	* This application written by Miles Lott <milosch@phpwhere.org>            *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/admin/inc/hook_config.inc.php b/admin/inc/hook_config.inc.php
index 2a412a9dfd..84b2b14277 100644
--- a/admin/inc/hook_config.inc.php
+++ b/admin/inc/hook_config.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
   * Written by Mark Peters <skeeter@phpgroupware.org>                        *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/hook_deleteaccount.inc.php b/admin/inc/hook_deleteaccount.inc.php
index 1e6425ec16..463d08cf5a 100755
--- a/admin/inc/hook_deleteaccount.inc.php
+++ b/admin/inc/hook_deleteaccount.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
   * Written by Mark Peters <skeeter@phpgroupware.org>                        *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/hook_manual.inc.php b/admin/inc/hook_manual.inc.php
index 8907244b29..8edaf77c6c 100755
--- a/admin/inc/hook_manual.inc.php
+++ b/admin/inc/hook_manual.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Calendar Holidays                                         *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Calendar Holidays                                           *
+  * http://www.egroupware.org                                                *
   * Written by Mark Peters <skeeter@phpgroupware.org>                        *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/admin/inc/hook_sidebox_menu.inc.php b/admin/inc/hook_sidebox_menu.inc.php
index dfac14c6fa..b6555fa983 100644
--- a/admin/inc/hook_sidebox_menu.inc.php
+++ b/admin/inc/hook_sidebox_menu.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare                                                               *
+	* http://www.egroupware.org                                                *
 	* Written by Pim Snel <pim@lingewoud.nl>                                   *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/anon_wrapper.php b/anon_wrapper.php
index 4fe0e03af7..59f7c39c00 100644
--- a/anon_wrapper.php
+++ b/anon_wrapper.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare                                                               *
+	* http://www.egroupware.org                                                *
 	* Written by Dan Kuykendall <seek3r@phpgroupware.org>                      *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *