diff --git a/phpgwapi/inc/class.Template.inc.php b/phpgwapi/inc/class.Template.inc.php
index 49087df7ad..e35e285014 100644
--- a/phpgwapi/inc/class.Template.inc.php
+++ b/phpgwapi/inc/class.Template.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Template class                                        *
+  * eGroupWare API - Template class                                          *
   * (C) Copyright 1999-2000 NetUSE GmbH Kristian Koehntopp                   *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.Template_experimental.inc.php b/phpgwapi/inc/class.Template_experimental.inc.php
index 3879811d39..67d2866356 100644
--- a/phpgwapi/inc/class.Template_experimental.inc.php
+++ b/phpgwapi/inc/class.Template_experimental.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Template class                                        *
+  * eGoupWare API - Template class                                           *
   * (C) Copyright 1999-2000 NetUSE GmbH Kristian Koehntopp                   *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGoupWare, but is used by eGoupWare.                 * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.accounts_contacts.inc.php b/phpgwapi/inc/class.accounts_contacts.inc.php
index 010c7d6e28..24b83c5e4c 100644
--- a/phpgwapi/inc/class.accounts_contacts.inc.php
+++ b/phpgwapi/inc/class.accounts_contacts.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Accounts manager for the contacts class               *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Accounts manager for the contacts class                 *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * View and manipulate account records using the contacts class             *
   * Copyright (C) 2000, 2001 Miles Lott                                      *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php
index e169516f20..2ec1ddadbc 100644
--- a/phpgwapi/inc/class.accounts_ldap.inc.php
+++ b/phpgwapi/inc/class.accounts_ldap.inc.php
@@ -1,6 +1,6 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Accounts manager for LDAP                             *
+	* eGroupWare API - Accounts manager for LDAP                               *
 	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
 	*        and Lars Kneschke <lkneschke@phpgw.de>                            *
 	*        and Miles Lott <milos@groupwhere.org>                             *
@@ -9,8 +9,8 @@
 	* Copyright (C) 2000 - 2002 Joseph Engo, Lars Kneschke                     *
 	* Copyright (C) 2003 Lars Kneschke, Bettina Gille                          *
 	* ------------------------------------------------------------------------ *
-	* 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/phpgwapi/inc/class.accounts_shared.inc.php b/phpgwapi/inc/class.accounts_shared.inc.php
index 36033bca72..b4cbe0b85f 100644
--- a/phpgwapi/inc/class.accounts_shared.inc.php
+++ b/phpgwapi/inc/class.accounts_shared.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Accounts manager shared functions                     *
+	* eGroupWare API - Accounts manager shared functions                       *
 	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
 	*        and Bettina Gille [ceb@phpgroupware.org]                          *
 	* shared functions for other account repository managers                   *
 	* Copyright (C) 2000 - 2002 Joseph Engo                                    *
 	* Copyright (C) 2003 Joseph Engo, Bettina Gille                            *
 	* -------------------------------------------------------------------------*
-	* 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/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php
index 17e933c777..b947deceb4 100644
--- a/phpgwapi/inc/class.accounts_sql.inc.php
+++ b/phpgwapi/inc/class.accounts_sql.inc.php
@@ -1,6 +1,6 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Accounts manager for SQL                              *
+	* eGroupWare API - Accounts manager for SQL                                *
 	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
 	*        and Dan Kuykendall <seek3r@phpgroupware.org>                      *
 	*        and Bettina Gille [ceb@phpgroupware.org]                          *
@@ -8,8 +8,8 @@
 	* Copyright (C) 2000 - 2002 Joseph Engo                                    *
 	* Copyright (C) 2003 Joseph Engo, Bettina Gille                            *
 	* ------------------------------------------------------------------------ *
-	* 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/phpgwapi/inc/class.acl.inc.php b/phpgwapi/inc/class.acl.inc.php
index 448cffac24..7d3a058761 100644
--- a/phpgwapi/inc/class.acl.inc.php
+++ b/phpgwapi/inc/class.acl.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Access Control List                                   *
+  * eGroupWare API - Access Control List                                     *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * Security scheme based on ACL design                                      *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.applications.inc.php b/phpgwapi/inc/class.applications.inc.php
index dfbbef8768..cb3ac6f074 100755
--- a/phpgwapi/inc/class.applications.inc.php
+++ b/phpgwapi/inc/class.applications.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Applications manager functions                        *
+	* eGroupWare API - Applications manager functions                          *
 	* This file written by Mark Peters <skeeter@phpgroupware.org>              *
 	* Copyright (C) 2001 Mark Peters                                           *
 	* ------------------------------------------------------------------------ *
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.auth_http.inc.php b/phpgwapi/inc/class.auth_http.inc.php
index b0cce1dd39..0940f1aac7 100644
--- a/phpgwapi/inc/class.auth_http.inc.php
+++ b/phpgwapi/inc/class.auth_http.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Auth from HTTP                                        *
+  * eGroupWare API - Auth from HTTP                                          *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * Authentication based on HTTP auth                                        *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.auth_ldap.inc.php b/phpgwapi/inc/class.auth_ldap.inc.php
index e14ca5de80..7763a8e791 100644
--- a/phpgwapi/inc/class.auth_ldap.inc.php
+++ b/phpgwapi/inc/class.auth_ldap.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Auth from LDAP                                        *
+	* eGroupWare API - Auth from LDAP                                          *
 	* This file written by Lars Kneschke <lkneschke@linux-at-work.de>          *
 	* and Joseph Engo <jengo@phpgroupware.org>                                 *
 	* Authentication based on LDAP Server                                      *
 	* Copyright (C) 2000, 2001 Joseph Engo                                     *
 	* Copyright (C) 2002, 2003 Lars Kneschke                                   *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          * 
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            * 
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.auth_mail.inc.php b/phpgwapi/inc/class.auth_mail.inc.php
index 9bc3a150e4..98f3c9b790 100644
--- a/phpgwapi/inc/class.auth_mail.inc.php
+++ b/phpgwapi/inc/class.auth_mail.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Auth from Mail server                                 *
+  * eGroupWare API - Auth from Mail server                                   *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * Authentication based on mail server                                      *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.auth_nis.inc.php b/phpgwapi/inc/class.auth_nis.inc.php
index 85229dc402..7f4184efcc 100644
--- a/phpgwapi/inc/class.auth_nis.inc.php
+++ b/phpgwapi/inc/class.auth_nis.inc.php
@@ -1,12 +1,12 @@
 <?php
 	/**************************************************************************\
-	* eGroupWare API - Auth from NIS	                                       *
+	* eGroupWare API - Auth from NIS	                                   *
 	* Authentication based on NIS maps                                         *
 	* by Dylan Adams <dadams@jhu.edu>                                          *
 	* Copyright (C) 2001 Dylan Adams                                           *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          * 
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *  
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.auth_sql.inc.php b/phpgwapi/inc/class.auth_sql.inc.php
index 6644555d25..5ad1f3c2d7 100644
--- a/phpgwapi/inc/class.auth_sql.inc.php
+++ b/phpgwapi/inc/class.auth_sql.inc.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Auth from SQL                                         *
+  * eGroupWare API - Auth from SQL                                           *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * Encryption types other than md5() added by                               *
diff --git a/phpgwapi/inc/class.auth_sqlssl.inc.php b/phpgwapi/inc/class.auth_sqlssl.inc.php
index 3505ecc97c..d46564d9c9 100644
--- a/phpgwapi/inc/class.auth_sqlssl.inc.php
+++ b/phpgwapi/inc/class.auth_sqlssl.inc.php
@@ -1,12 +1,12 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Auth from SQL, with optional SSL authentication       *
+	* eGroupWare API - Auth from SQL, with optional SSL authentication         *
 	* This file written by Andreas 'Count' Kotes <count@flatline.de>           *
 	* Authentication based on SQL table and X.509 certificates                 *
 	* Copyright (C) 2000, 2001 Dan Kuykendall                                  *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          * 
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            * 
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.browser.inc.php b/phpgwapi/inc/class.browser.inc.php
index 93e77d05f0..f7ff2f2d7b 100644
--- a/phpgwapi/inc/class.browser.inc.php
+++ b/phpgwapi/inc/class.browser.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Browser detect functions                              *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Browser detect functions                                *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Majority of code borrowed from Sourceforge 2.5                           *
   * Copyright 1999-2000 (c) The SourceForge Crew - http://sourceforge.net    *
-  * Browser detection functions for phpGroupWare developers                  *
+  * Browser detection functions for eGroupWare developers                    *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.categories.inc.php b/phpgwapi/inc/class.categories.inc.php
index ccb31f681b..28b7efbb5b 100644
--- a/phpgwapi/inc/class.categories.inc.php
+++ b/phpgwapi/inc/class.categories.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Categories                                            *
+	* eGroupWare API - Categories                                              *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	*                  and Bettina Gille [ceb@phpgroupware.org]                *
 	* Category manager                                                         *
 	* Copyright (C) 2000, 2001 Joseph Engo, Bettina Gille                      *
 	* Copyright (C) 2002, 2003 Bettina Gille                                   *
 	* ------------------------------------------------------------------------ *
-	* 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 *
@@ -137,7 +137,7 @@
 		@param $query string defaults to ''
 		@param $sort string sort order, either defaults to 'ASC'
 		@param $order order by
-		@param $globals True or False, includes the global phpgroupware categories or not
+		@param $globals True or False, includes the global egroupware categories or not
 		@result $cats array
 		*/
 		function return_array($type,$start,$limit = True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '', $lastmod = -1, $column = '')
@@ -453,7 +453,7 @@
 		@param $format currently supports select (select box) or list
 		@param $type string - subs or mains
 		@param $selected - cat_id or array with cat_id values
-		@param $globals True or False, includes the global phpgroupware categories or not
+		@param $globals True or False, includes the global egroupware categories or not
 		@result $s array - populated with categories
 		*/
 		function formatted_list($format,$type='',$selected = '',$globals = False,$site_link = 'site')
diff --git a/phpgwapi/inc/class.clientsniffer.inc.php b/phpgwapi/inc/class.clientsniffer.inc.php
index 89c70a3f1f..bdc717364c 100644
--- a/phpgwapi/inc/class.clientsniffer.inc.php
+++ b/phpgwapi/inc/class.clientsniffer.inc.php
@@ -1,9 +1,9 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Client browser detection                              *
+  * eGroupWare API - Client browser detection                                *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by 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/phpgwapi/inc/class.config.inc.php b/phpgwapi/inc/class.config.inc.php
index aa912d7523..8b8986b9b6 100755
--- a/phpgwapi/inc/class.config.inc.php
+++ b/phpgwapi/inc/class.config.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Application configuration in a centralized location   *
+	* eGroupWare API - Application configuration in a centralized location     *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	* Copyright (C) 2000, 2001 Joseph Engo                                     *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          * 
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            * 
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.contacts.inc.php b/phpgwapi/inc/class.contacts.inc.php
index 64a0e0af64..5371f0dd86 100644
--- a/phpgwapi/inc/class.contacts.inc.php
+++ b/phpgwapi/inc/class.contacts.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Contact Management Shared Routines                    *
+	* eGroupWare API - Contact Management Shared Routines                      *
 	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
-	*        and Miles Lott <milosch@phpgroupware.org>                         *
+	*        and Miles Lott <milosch@groupwhere.org>                           *
 	*        and Bettina Gille <ceb@phpgroupware.org>                          *
 	* View and manipulate contact records                                      *
 	* Copyright (C) 2001, 2002 Joseph Engo, Miles Lott, Bettina Gille          *
 	* -------------------------------------------------------------------------*
-	* 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 *
@@ -84,7 +84,7 @@
 		}
 
 		/**
-		* Get the the person data what you want. Wrapper function to stay compatible with phpgroupware.
+		* Get the the person data what you want. Wrapper function to stay compatible with egroupware.
 		*
 		* @author Lars Kneschke <lars@kneschke.de>
 		* @param array $fields The fields that you can see from person
diff --git a/phpgwapi/inc/class.contacts_ldap.inc.php b/phpgwapi/inc/class.contacts_ldap.inc.php
index 6026a2f469..f699d498cc 100644
--- a/phpgwapi/inc/class.contacts_ldap.inc.php
+++ b/phpgwapi/inc/class.contacts_ldap.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Accounts manager for LDAP                             *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Accounts manager for LDAP                               *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * View and manipulate contact records using LDAP                           *
   * ------------------------------------------------------------------------ *
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          *
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.contacts_sql.inc.php b/phpgwapi/inc/class.contacts_sql.inc.php
index 2b9b804d70..d8beae93ba 100644
--- a/phpgwapi/inc/class.contacts_sql.inc.php
+++ b/phpgwapi/inc/class.contacts_sql.inc.php
@@ -1,13 +1,13 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Contacts manager for SQL                              *
+	* eGroupWare API - Contacts manager for SQL                                *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
-	*   and Miles Lott <milosch@phpgroupware.org>                              *
+	*   and Miles Lott <milosch@groupwhere.org>                                *
 	* View and manipulate contact records using SQL                            *
 	* Copyright (C) 2001 Joseph Engo                                           *
 	* ------------------------------------------------------------------------ *
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.country.inc.php b/phpgwapi/inc/class.country.inc.php
index 1887baff8e..9e2c19b02e 100755
--- a/phpgwapi/inc/class.country.inc.php
+++ b/phpgwapi/inc/class.country.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/phpgwapi/inc/class.crypto.inc.php b/phpgwapi/inc/class.crypto.inc.php
index 5f31081c1f..2c15543b3f 100644
--- a/phpgwapi/inc/class.crypto.inc.php
+++ b/phpgwapi/inc/class.crypto.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Crypto                                                *
+  * eGroupWare API - Crypto                                                  *
   * This file written by Joseph Engo <jengo@phpgroupware.org>                *
   * Handles encrypting strings based on various encryption schemes           *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          *
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *
   * -------------------------------------------------------------------------*
   * 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/phpgwapi/inc/class.datetime.inc.php b/phpgwapi/inc/class.datetime.inc.php
index 932f8a98ba..e4d3ab1f4d 100755
--- a/phpgwapi/inc/class.datetime.inc.php
+++ b/phpgwapi/inc/class.datetime.inc.php
@@ -1,6 +1,6 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Commononly used functions                             *
+	* eGroupWare API - Commononly used functions                               *
 	* This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
 	* and Joseph Engo <jengo@phpgroupware.org>                                 *
 	* and Mark Peters <skeeter@phpgroupware.org>                               *
diff --git a/phpgwapi/inc/class.db_msql.inc.php b/phpgwapi/inc/class.db_msql.inc.php
index 708123e3d9..a0fe4bf23f 100644
--- a/phpgwapi/inc/class.db_msql.inc.php
+++ b/phpgwapi/inc/class.db_msql.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API -                                                       *
+  * eGroupWare API -                                                         *
   * Copyright (c) 1998,1999 SH Online Dienst GmbH Boris Erdmann,             *
   * Kristian Koehntopp                                                       *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used byeGroupWare.                * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.db_mssql.inc.php b/phpgwapi/inc/class.db_mssql.inc.php
index 85fc696ad9..85af6bba6e 100644
--- a/phpgwapi/inc/class.db_mssql.inc.php
+++ b/phpgwapi/inc/class.db_mssql.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - MS SQL Server support                                 *
+  * eGroupWare API - MS SQL Server support                                   *
   * (C) Copyright 1998 Cameron Taggart (cameront@wolfenet.com)               *
   *  Modified by Guarneri carmelo (carmelo@melting-soft.com)                 *
-  *	 Modified by Cameron Just     (C.Just@its.uq.edu.au)                     *
+  *	 Modified by Cameron Just     (C.Just@its.uq.edu.au)                 *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.db_mysql.inc.php b/phpgwapi/inc/class.db_mysql.inc.php
index 534d05cea2..a3c4080872 100644
--- a/phpgwapi/inc/class.db_mysql.inc.php
+++ b/phpgwapi/inc/class.db_mysql.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - MySQL database support                                *
+  * eGroupWare API - MySQL database support                                  *
   * Copyright (c) 1998-2000 NetUSE AG Boris Erdmann, Kristian Koehntopp      *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.db_odbc.inc.php b/phpgwapi/inc/class.db_odbc.inc.php
index ffd415a488..4eeb9c53ad 100644
--- a/phpgwapi/inc/class.db_odbc.inc.php
+++ b/phpgwapi/inc/class.db_odbc.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - ODBC Database support                                 *
+  * eGroupWare API - ODBC Database support                                   *
   * Copyright (c) 1998,1999 SH Online Dienst GmbH Boris Erdmann,             *
   * Kristian Koehntopp                                                       *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.db_oracle.inc.php b/phpgwapi/inc/class.db_oracle.inc.php
index 0e2573baa7..b9ec433b9d 100644
--- a/phpgwapi/inc/class.db_oracle.inc.php
+++ b/phpgwapi/inc/class.db_oracle.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API -                                                       *
+	* eGroupWare API -                                                         *
 	* Copyright (c) 1998-2000 Luis Francisco Gonzalez Hernandez                *
 	* Oracle accessor based on Session Management for PHP3                     *
 	* ------------------------------------------------------------------------ *
-	* This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-	* http://www.phpgroupware.org/                                             * 
+	* This is not part of phpGroupWare, but is used by eGroupWare.             * 
+	* http://www.egroupware.org/                                               * 
 	* ------------------------------------------------------------------------ *
 	* This program is free software; you can redistribute it and/or modify it  *
 	* under the terms of the GNU Lesser General Public License as published	   *
diff --git a/phpgwapi/inc/class.db_pgsql.inc.php b/phpgwapi/inc/class.db_pgsql.inc.php
index 9f082d922c..1fb0344522 100644
--- a/phpgwapi/inc/class.db_pgsql.inc.php
+++ b/phpgwapi/inc/class.db_pgsql.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API -                                                       *
+  * eGroupWare API -                                                         *
   * Copyright (c) 1998,1999 SH Online Dienst GmbH Boris Erdmann,             *
   * Kristian Koehntopp                                                       *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           *
-  * http://www.phpgroupware.org/                                             *
+  * This is not part of eGroupWare, but is used by eGroupWare.               *
+  * http://www.egroupware.org/                                               *
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.db_sybase.inc.php b/phpgwapi/inc/class.db_sybase.inc.php
index b5c4f88124..a32e07365b 100644
--- a/phpgwapi/inc/class.db_sybase.inc.php
+++ b/phpgwapi/inc/class.db_sybase.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Sybase DB support                                     *
+  * eGroupWare API - Sybase DB support                                       *
   * Copyright (c) 1998,1999 SH Online Dienst GmbH Boris Erdmann,             *
   * Kristian Koehntopp                                                       *
   * Adapted from db_mysql.inc by Sascha Schumann <sascha@schumann.cx>        *
   * metadata() contributed by Adelino Monteiro <adelino@infologia.pt>        *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               *  
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.error.inc.php b/phpgwapi/inc/class.error.inc.php
index a3490ef357..c661d206ec 100755
--- a/phpgwapi/inc/class.error.inc.php
+++ b/phpgwapi/inc/class.error.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - eventlog                                                  *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - eventlog                                                    *
+	* http://www.egroupware.org                                                *
 	* This application written by jerry westrick <jerry@westrick.com>          *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/phpgwapi/inc/class.errorlog.inc.php b/phpgwapi/inc/class.errorlog.inc.php
index f6b143936d..08f3502ec7 100644
--- a/phpgwapi/inc/class.errorlog.inc.php
+++ b/phpgwapi/inc/class.errorlog.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - errorlog                                                  *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - errorlog                                                    *
+	* http://www.egroupware.org                                                *
 	* This application written by jerry westrick <jerry@westrick.com>          *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/phpgwapi/inc/class.gdgraph.inc.php b/phpgwapi/inc/class.gdgraph.inc.php
index 944378980b..971f1cb509 100644
--- a/phpgwapi/inc/class.gdgraph.inc.php
+++ b/phpgwapi/inc/class.gdgraph.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/*******************************************************************\
-	* phpGroupWare - GD Graph                                           *
-	* http://www.phpgroupware.org                                       *
+	* eGroupWare - GD Graph                                             *
+	* http://www.egroupware.org                                       *
 	* This program is part of the GNU project, see http://www.gnu.org/  *
 	*                                                                   *
 	* Written by Bettina Gille [ceb@phpgroupware.org]                   *
@@ -13,7 +13,7 @@
 	* Double Choco Latte - Source Configuration Management System       *
 	* Copyright (C) 1999  Michael L. Dean & Tim R. Norman               *
 	* ----------------------------------------------------------------- *
-	* This library is part of the phpGroupWare API                      *
+	* This library is part of the eGroupWare API                        *
 	* ----------------------------------------------------------------- *
 	* This library is free software; you can redistribute it and/or     *
 	* modify it under the terms of the GNU General Public License as    *
diff --git a/phpgwapi/inc/class.gdimage.inc.php b/phpgwapi/inc/class.gdimage.inc.php
index ee8b0fda1b..353eb25277 100644
--- a/phpgwapi/inc/class.gdimage.inc.php
+++ b/phpgwapi/inc/class.gdimage.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/*******************************************************************\
-	* phpGroupWare - GD Image                                           *
-	* http://www.phpgroupware.org                                       *
+	* eGroupWare - GD Image                                             *
+	* http://www.egroupware.org                                         *
 	*                                                                   *
 	* Written by by Bettina Gille [ceb@phpgroupware.org]                *
 	*                                                                   *
@@ -12,7 +12,7 @@
 	* Double Choco Latte - Source Configuration Management System       *
 	* Copyright (C) 1999  Michael L. Dean & Tim R. Norman               *
 	* ----------------------------------------------------------------- *
-	* This library is part of the phpGroupWare API                      *
+	* This library is part of the eGroupWare API                        *
 	* ----------------------------------------------------------------- *
 	* This library is free software; you can redistribute it and/or     *
 	* modify it under the terms of the GNU General Public License as    *
diff --git a/phpgwapi/inc/class.graphics.inc.php b/phpgwapi/inc/class.graphics.inc.php
index 26ead56fee..3762b97f8b 100644
--- a/phpgwapi/inc/class.graphics.inc.php
+++ b/phpgwapi/inc/class.graphics.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Graphical                                             *
-  * This file written by Lars Kneschke <knecke@phpgroupware.org>             *
+  * eGroupWare API - Graphical                                               *
+  * This file written by Lars Kneschke <lars@kneschke.de>                    *
   * Allows the creation of graphical buttons                                 *
   * Copyright (C) 2001 Lars Kneschke                                         *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.historylog.inc.php b/phpgwapi/inc/class.historylog.inc.php
index 875b75b336..5d9e2dd316 100644
--- a/phpgwapi/inc/class.historylog.inc.php
+++ b/phpgwapi/inc/class.historylog.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Record history logging                                *
+	* eGroupWare API - Record history logging                                  *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	* Copyright (C) 2001 Joseph Engo                                           *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.hooks.inc.php b/phpgwapi/inc/class.hooks.inc.php
index e7ae782705..8ead32c1bb 100644
--- a/phpgwapi/inc/class.hooks.inc.php
+++ b/phpgwapi/inc/class.hooks.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Hooks                                                 *
+  * eGroupWare API - Hooks                                                   *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * Allows applications to "hook" into each other                            *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.http.inc.php b/phpgwapi/inc/class.http.inc.php
index 591aaa04a3..8d5dabc010 100644
--- a/phpgwapi/inc/class.http.inc.php
+++ b/phpgwapi/inc/class.http.inc.php
@@ -1,9 +1,9 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - HTTP protocol class                                   *
-  * http://www.phpgroupware.org/api                                          *
+  * eGroupWare API - HTTP protocol class                                     *
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.http_dav_client.inc.php b/phpgwapi/inc/class.http_dav_client.inc.php
index 3363a7e595..af3179e2e6 100644
--- a/phpgwapi/inc/class.http_dav_client.inc.php
+++ b/phpgwapi/inc/class.http_dav_client.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - WebDAV                                                *
+  * eGroupWare API - WebDAV                                                  *
   * This file written by Jonathon Sim (for Zeald Ltd) <jsim@free.net.nz>     *
   * Provides methods for manipulating an RFC 2518 DAV repository             *
   * Copyright (C) 2002 Zeald Ltd                                             *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          *
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.interserver.inc.php b/phpgwapi/inc/class.interserver.inc.php
index 11c4085293..356aa6a4d8 100644
--- a/phpgwapi/inc/class.interserver.inc.php
+++ b/phpgwapi/inc/class.interserver.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - phpgw Inter-server communications class               *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - phpgw Inter-server communications class                 *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Maintain list and provide send interface to remote phpgw servers         *
   * Copyright (C) 2001 Miles Lott                                            *
   * -------------------------------------------------------------------------*
diff --git a/phpgwapi/inc/class.javascript.inc.php b/phpgwapi/inc/class.javascript.inc.php
index 44f8248177..8b310bc207 100644
--- a/phpgwapi/inc/class.javascript.inc.php
+++ b/phpgwapi/inc/class.javascript.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - JavaScript                                            *
+  * eGroupWare API - JavaScript                                              *
   * Written by Dave Hall skwashd at phpgroupware.org                         *
   * Copyright (C) 2003 Free Software Foundation Inc                          *		
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   *  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   *
@@ -15,7 +15,7 @@
   /* $Id$ */
 
        /**
-       * phpGroupWare javascript support class
+       * eGroupWare javascript support class
        *
        * Only instanstiate this class using:
        * <code>
@@ -38,7 +38,6 @@
        * @copyright &copy; 2003 Free Software Foundation
        * @license GPL
        * @uses template
-       * @link http://docs.phpgroupware.org/wiki/classJavaScript
        */
 	class javascript
 	{
diff --git a/phpgwapi/inc/class.listbox.inc.php b/phpgwapi/inc/class.listbox.inc.php
index ed31e56549..60523f4149 100755
--- a/phpgwapi/inc/class.listbox.inc.php
+++ b/phpgwapi/inc/class.listbox.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Link box generator                                    *
-  * http://www.phpgroupware.org/api                                          *
+  * eGroupWare API - Link box generator                                      *
+  * http://www.egroupware.org/api                                            *
   * This file written by Mark Peters <skeeter@phpgroupware.org>              *
   * Creates listboxes using templates                                        *
   * Copyright (C) 2000, 2001 Mark Peters                                     *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.log.inc.php b/phpgwapi/inc/class.log.inc.php
index 9547198e90..88611c4b47 100644
--- a/phpgwapi/inc/class.log.inc.php
+++ b/phpgwapi/inc/class.log.inc.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare - log                                                       *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare - log                                                         *
+	* http://www.egroupware.org                                                *
 	* This application written by jerry westrick <jerry@westrick.com>          *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
diff --git a/phpgwapi/inc/class.matrixview.inc.php b/phpgwapi/inc/class.matrixview.inc.php
index 8d1890b816..5051ba7744 100644
--- a/phpgwapi/inc/class.matrixview.inc.php
+++ b/phpgwapi/inc/class.matrixview.inc.php
@@ -1,6 +1,6 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Matrix View Generator                                 *
+	* eGroupWare API - Matrix View Generator                                   *
 	* This file written by Marc Logemann <loge@phpgroupware.org>               *
 	* class for creating matrix like timeframes for items                      *
 	*                                                                          *
@@ -11,8 +11,8 @@
 	*                                                                          *
 	* Copyright (C) 2000, 2001 Marc Logemann                                   *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          * 
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            * 
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.menutree.inc.php b/phpgwapi/inc/class.menutree.inc.php
index fdf5c2325d..73432d06d1 100644
--- a/phpgwapi/inc/class.menutree.inc.php
+++ b/phpgwapi/inc/class.menutree.inc.php
@@ -1,11 +1,11 @@
 <?php  
   /**************************************************************************\
-  * phpGroupWare API - MenuTree                                              *
+  * eGroupWare API - MenuTree                                                *
   * This file based on PHP3 TreeMenu                                         *
   * (c)1999 Bjorge Dijkstra <bjorge@gmx.net>                                 *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by 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/phpgwapi/inc/class.mime_magic.inc.php b/phpgwapi/inc/class.mime_magic.inc.php
index a0ad08923a..b714ab2f70 100644
--- a/phpgwapi/inc/class.mime_magic.inc.php
+++ b/phpgwapi/inc/class.mime_magic.inc.php
@@ -1,7 +1,7 @@
 <?php
   /********************************************************************\
-  * phpGroupWare - phpGroupWare API - mime magic                       *
-  * http://www.phpgroupware.org                                        *
+  * eGroupWare - eGroupWare API - mime magic                           *
+  * http://www.egroupware.org                                          *
   * This program is part of the GNU project, see http://www.gnu.org    *
   *                                                                    *
   * Originally taken from the Horde Framework http://horde.org         *
diff --git a/phpgwapi/inc/class.net_http_client.inc.php b/phpgwapi/inc/class.net_http_client.inc.php
index 81294e4979..572f11a3c4 100644
--- a/phpgwapi/inc/class.net_http_client.inc.php
+++ b/phpgwapi/inc/class.net_http_client.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - HTTP and WebDAV protocol class                        *
-  * http://www.phpgroupware.org/api                                          *
+  * eGroupWare API - HTTP and WebDAV protocol class                          *
+  * http://www.egroupware.org/api                                            *
   * Original Author: Leo West <west_leo@yahoo-REMOVE-.com>                   *
   * ------------------------------------------------------------------------ *
-  * This library is not part of phpGroupWare, but is used by phpGroupWare.   * 
+  * This library is not part of eGroupWare, but is used by eGroupWare.       * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.network.inc.php b/phpgwapi/inc/class.network.inc.php
index 4fa6adc6b9..8e72404496 100644
--- a/phpgwapi/inc/class.network.inc.php
+++ b/phpgwapi/inc/class.network.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Network                                               *
+  * eGroupWare API - Network                                                 *
   * This file written by Mark Peters <skeeter@phpgroupware.org>              *
   * Handles opening network socket connections, taking proxy into account    *
   * Copyright (C) 2000, 2001 Mark Peters                                     *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index be466267e1..4be9ca2ccc 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - nextmatchs                                            *
+	* eGroupWare API - nextmatchs                                              *
 	* Written by Joseph Engo <jengo@phpgroupware.org>                          *
 	*        and Bettina Gille [ceb@phpgroupware.org]                          *
 	* Handles limiting number of rows displayed                                *
 	* Copyright (C) 2000, 2001 Joseph Engo                                     *
 	* Copyright (C) 2002, 2003 Joseph Engo, Bettina Gille                      *
 	* ------------------------------------------------------------------------ *
-	* 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/phpgwapi/inc/class.phpgw.inc.php b/phpgwapi/inc/class.phpgw.inc.php
index 61758524ef..1202672268 100644
--- a/phpgwapi/inc/class.phpgw.inc.php
+++ b/phpgwapi/inc/class.phpgw.inc.php
@@ -1,14 +1,14 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Core class and functions for phpGroupWare             *
+	* eGroupWare API - Core class and functions for eGroupWare                 *
 	* This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
 	* and Joseph Engo <jengo@phpgroupware.org>                                 *
-	* This is the central class for the phpGroupWare API                       *
+	* This is the central class for the eGroupWare API                         *
 	* Copyright (C) 2000, 2001 Dan Kuykendall                                  *
 	* Parts Copyright (C) 2003 Free Software Foundation                        *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.ping.inc.php b/phpgwapi/inc/class.ping.inc.php
index d07ff63276..6f90d32ce0 100755
--- a/phpgwapi/inc/class.ping.inc.php
+++ b/phpgwapi/inc/class.ping.inc.php
@@ -1,12 +1,12 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Ping class                                            *
+	* eGroupWare API - Ping class                                              *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	* Linux only ping class for detecting network connections                  *
 	* Copyright (C) 2001 Joseph Engo                                           *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.portalbox.inc.php b/phpgwapi/inc/class.portalbox.inc.php
index 488d8ffb60..b6657a43c7 100755
--- a/phpgwapi/inc/class.portalbox.inc.php
+++ b/phpgwapi/inc/class.portalbox.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Portal Box manager                                    *
+  * eGroupWare API - Portal Box manager                                      *
   * This file written by Joseph Engo <jengo@phpgroupware.org>                *
-  * Helps manage the portal boxes for phpGroupWares main page                *
+  * Helps manage the portal boxes for eGroupWares main page                  *
   * Copyright (C) 2000, 2001  Joseph Engo                                    *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.preferences.inc.php b/phpgwapi/inc/class.preferences.inc.php
index f6a0947ea4..e9e263fa5c 100644
--- a/phpgwapi/inc/class.preferences.inc.php
+++ b/phpgwapi/inc/class.preferences.inc.php
@@ -1,13 +1,13 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Preferences                                           *
+	* eGroupWare API - Preferences                                             *
 	* This file written by Joseph Engo <jengo@phpgroupware.org>                *
 	* and Mark Peters <skeeter@phpgroupware.org>                               *
 	* Manages user preferences                                                 *
 	* Copyright (C) 2000, 2001 Joseph Engo                                     *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
-	* http://www.phpgroupware.org/api                                          *
+	* This library is part of the eGroupWare API                               *
+	* http://www.egroupware.org/api                                            *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.resultbox.inc.php b/phpgwapi/inc/class.resultbox.inc.php
index c3e532bf0e..976a723422 100644
--- a/phpgwapi/inc/class.resultbox.inc.php
+++ b/phpgwapi/inc/class.resultbox.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Result box                                            *
+  * eGroupWare API - Result box                                              *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * Creates result boxes using templates                                     *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.rssparser.inc.php b/phpgwapi/inc/class.rssparser.inc.php
index 2546e41128..fe08d1ceeb 100644
--- a/phpgwapi/inc/class.rssparser.inc.php
+++ b/phpgwapi/inc/class.rssparser.inc.php
@@ -1,9 +1,9 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - rss parser                                            *
+  * eGroupWare API - rss parser                                              *
   * ------------------------------------------------------------------------ *
-  * This is not part of phpGroupWare, but is used by phpGroupWare.           * 
-  * http://www.phpgroupware.org/                                             * 
+  * This is not part of eGroupWare, but is used by eGroupWare.               * 
+  * http://www.egroupware.org/                                               * 
   * ------------------------------------------------------------------------ *
   * This program is free software; you can redistribute it and/or modify it  *
   * under the terms of the GNU Lesser General Public License as published    *
diff --git a/phpgwapi/inc/class.sbox.inc.php b/phpgwapi/inc/class.sbox.inc.php
index b5d2c77eaa..5f7467efd8 100644
--- a/phpgwapi/inc/class.sbox.inc.php
+++ b/phpgwapi/inc/class.sbox.inc.php
@@ -1,11 +1,11 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare API - Select Box                                            *
+	* eGroupWare API - Select Box                                              *
 	* This file written by Marc Logemann <loge@phpgroupware.org>               *
 	* Class for creating predefines select boxes                               *
 	* Copyright (C) 2000, 2001 Dan Kuykendall                                  *
 	* -------------------------------------------------------------------------*
-	* This library is part of the phpGroupWare API                             *
+	* This library is part of the eGroupWare API                               *
 	* ------------------------------------------------------------------------ *
 	* 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/phpgwapi/inc/class.sbox2.inc.php b/phpgwapi/inc/class.sbox2.inc.php
index 9584c1eed7..9defa3301c 100644
--- a/phpgwapi/inc/class.sbox2.inc.php
+++ b/phpgwapi/inc/class.sbox2.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Select Box 2                                          *
+  * eGroupWare API - Select Box 2                                            *
   * Written by Ralf Becker <RalfBecker@outdoor-training.de>                  *
   * Class for creating select boxes for addresse, projects, array items, ... *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          *
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.schema_proc.inc.php b/phpgwapi/inc/class.schema_proc.inc.php
index 0fcf254f89..1e276fa7c6 100644
--- a/phpgwapi/inc/class.schema_proc.inc.php
+++ b/phpgwapi/inc/class.schema_proc.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Michael Dean<mdean@users.sourceforge.net>           *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.schema_proc_array.inc.php b/phpgwapi/inc/class.schema_proc_array.inc.php
index a165807a22..d610d13653 100644
--- a/phpgwapi/inc/class.schema_proc_array.inc.php
+++ b/phpgwapi/inc/class.schema_proc_array.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * wGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Michael Dean<mdean@users.sourceforge.net>           *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.schema_proc_mssql.inc.php b/phpgwapi/inc/class.schema_proc_mssql.inc.php
index fbd42f58df..fb5b79e958 100644
--- a/phpgwapi/inc/class.schema_proc_mssql.inc.php
+++ b/phpgwapi/inc/class.schema_proc_mssql.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Michael Dean<mdean@users.sourceforge.net>           *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.schema_proc_mysql.inc.php b/phpgwapi/inc/class.schema_proc_mysql.inc.php
index 326e987070..0dcb8a990a 100644
--- a/phpgwapi/inc/class.schema_proc_mysql.inc.php
+++ b/phpgwapi/inc/class.schema_proc_mysql.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Michael Dean<mdean@users.sourceforge.net>           *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.schema_proc_pgsql.inc.php b/phpgwapi/inc/class.schema_proc_pgsql.inc.php
index 474e28210d..a84c997386 100644
--- a/phpgwapi/inc/class.schema_proc_pgsql.inc.php
+++ b/phpgwapi/inc/class.schema_proc_pgsql.inc.php
@@ -1,14 +1,14 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * SQL for table properties taken from phpPgAdmin Version 2.2.1             *
   *   http://www.greatbridge.org/project/phppgadmin                          *
   * Copyright (C) 1999-2000 Dan Wilson <phpPgAdmin@acucore.com>              *
   * Copyright (C) 1998-1999 Tobias Ratschiller <tobias@dnet.it>              *
   * --------------------------------------------                             *
   * This file written by Michael Dean<mdean@users.sourceforge.net>           *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.send.inc.php b/phpgwapi/inc/class.send.inc.php
index 46e25cadc9..af6cc0d08c 100644
--- a/phpgwapi/inc/class.send.inc.php
+++ b/phpgwapi/inc/class.send.inc.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - smtp mailer                                           *
+  * eGroupWare API - smtp mailer                                             *
   * This file written by Itzchak Rehberg <izzysoft@qumran.org>               *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * This module should replace php's mail() function. It is fully syntax     *
@@ -9,8 +9,8 @@
   * details on this variable).                                               *
   * Copyright (C) 2000, 2001 Itzchak Rehberg                                 *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.service.inc.php b/phpgwapi/inc/class.service.inc.php
index bebf2f5720..d6668efd47 100644
--- a/phpgwapi/inc/class.service.inc.php
+++ b/phpgwapi/inc/class.service.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Services Abstraction Class                            *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Services Abstraction Class                              *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Copyright (C) 2001 Miles Lott                                            *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.service_contacts.inc.php b/phpgwapi/inc/class.service_contacts.inc.php
index 624a343a44..32f15409f7 100644
--- a/phpgwapi/inc/class.service_contacts.inc.php
+++ b/phpgwapi/inc/class.service_contacts.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Services Abstraction Class                            *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Services Abstraction Class                              *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Copyright (C) 2001 Miles Lott                                            *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.service_notes.inc.php b/phpgwapi/inc/class.service_notes.inc.php
index f0e00e6456..ed1cb4f508 100644
--- a/phpgwapi/inc/class.service_notes.inc.php
+++ b/phpgwapi/inc/class.service_notes.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Services Abstraction Class                            *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Services Abstraction Class                              *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Copyright (C) 2001 Miles Lott                                            *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.service_schedule.inc.php b/phpgwapi/inc/class.service_schedule.inc.php
index dda025c268..b7c93ed2b8 100644
--- a/phpgwapi/inc/class.service_schedule.inc.php
+++ b/phpgwapi/inc/class.service_schedule.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Services Abstraction Class                            *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Services Abstraction Class                              *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * Copyright (C) 2001 Miles Lott                                            *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.sessions.inc.php b/phpgwapi/inc/class.sessions.inc.php
index b2b44ced75..f4f712362b 100644
--- a/phpgwapi/inc/class.sessions.inc.php
+++ b/phpgwapi/inc/class.sessions.inc.php
@@ -1,14 +1,14 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Session management                                    *
+  * eGroupWare API - Session management                                      *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * and Ralf Becker <ralfbecker@outdoor-training.de>                         *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * Parts Copyright (C) 2003 Free Software Foundation Inc                    *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               * 
+  * http://www.egroupware.org/api                                            *  
   * ------------------------------------------------------------------------ *
   * 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 *
@@ -30,7 +30,7 @@
 	/**
 	* Session Management Libabray
 	*
-	* This allows phpGroupWare to use php4 or database sessions
+	* This allows eGroupWare to use php4 or database sessions
 	*
 	* @package phpgwapi
 	* @subpackage sessions
@@ -1094,7 +1094,7 @@
 		/**
 		* Generate a url which supports url or cookies based sessions
 		*
-		* @param string $url a url relative to the phpgroupware install root
+		* @param string $url a url relative to the egroupware install root
 		* @param array $extravars query string arguements
 		* @return string generated url
 		*/
diff --git a/phpgwapi/inc/class.sessions_db.inc.php b/phpgwapi/inc/class.sessions_db.inc.php
index 11f05fad00..0ee5eccfa4 100644
--- a/phpgwapi/inc/class.sessions_db.inc.php
+++ b/phpgwapi/inc/class.sessions_db.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Session management                                    *
+  * eGroupWare API - Session management                                      *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.sessions_php4.inc.php b/phpgwapi/inc/class.sessions_php4.inc.php
index b8c24720c8..335e402c20 100644
--- a/phpgwapi/inc/class.sessions_php4.inc.php
+++ b/phpgwapi/inc/class.sessions_php4.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Session management                                    *
+  * eGroupWare API - Session management                                      *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * and Ralf Becker <ralfbecker@outdoor-training.de>                         *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
   * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.setup.inc.php b/phpgwapi/inc/class.setup.inc.php
index 78895db96c..38a0e4eec8 100644
--- a/phpgwapi/inc/class.setup.inc.php
+++ b/phpgwapi/inc/class.setup.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Joseph Engo<jengo@phpgroupware.org>                 *
   *  and Dan Kuykendall<seek3r@phpgroupware.org>                             *
   *  and Mark Peters<skeeter@phpgroupware.org>                               *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.setup_detection.inc.php b/phpgwapi/inc/class.setup_detection.inc.php
index 5c1b3c5705..04644f61d7 100644
--- a/phpgwapi/inc/class.setup_detection.inc.php
+++ b/phpgwapi/inc/class.setup_detection.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   * This file written by Dan Kuykendall<seek3r@phpgroupware.org>             *
   *  and Miles Lott<milos@groupwhere.org>                                    *
diff --git a/phpgwapi/inc/class.setup_html.inc.php b/phpgwapi/inc/class.setup_html.inc.php
index 6799b0b282..2553fd711f 100644
--- a/phpgwapi/inc/class.setup_html.inc.php
+++ b/phpgwapi/inc/class.setup_html.inc.php
@@ -1,10 +1,10 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
-  * This file written by Tony Puglisi (Angles) <angles@phpgroupware.org>     *
-  *  and Miles Lott<milosch@phpgroupware.org>                                *
+  * This file written by Tony Puglisi (Angles) <angles@aminvestments.com>    *
+  *  and Miles Lott<milosch@groupwhere.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/phpgwapi/inc/class.setup_translation.inc.php b/phpgwapi/inc/class.setup_translation.inc.php
index 89183dd9c2..f421f3984f 100644
--- a/phpgwapi/inc/class.setup_translation.inc.php
+++ b/phpgwapi/inc/class.setup_translation.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Translation class for phpgw lang files                *
-  * This file written by Miles Lott <milosch@phpgroupware.org>               *
+  * eGroupWare API - Translation class for phpgw lang files                  *
+  * This file written by Miles Lott <milosch@groupwhere.org>                 *
   * and Dan Kuykendall <seek3r@phpgroupware.org>                             *
   * Handles multi-language support using flat files                          *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *  
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.soap_server.inc.php b/phpgwapi/inc/class.soap_server.inc.php
index bb034e1c7a..c557eac990 100644
--- a/phpgwapi/inc/class.soap_server.inc.php
+++ b/phpgwapi/inc/class.soap_server.inc.php
@@ -113,7 +113,7 @@
 			}
 			else
 			{
-				/* phpgroupware customization - createobject based on methodname */
+				/* egroupware customization - createobject based on methodname */
 				list($app,$class,$method) = explode('.',$this->methodname);
 				if(ereg("^service",$app))
 				{
diff --git a/phpgwapi/inc/class.translation_file.inc.php b/phpgwapi/inc/class.translation_file.inc.php
index b35a1a9ee4..6d5c7e2c4d 100644
--- a/phpgwapi/inc/class.translation_file.inc.php
+++ b/phpgwapi/inc/class.translation_file.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Translation class for phpgw lang files                *
+  * eGroupWare API - Translation class for phpgw lang files                  *
   * This file written by Miles Lott <milosch@phpgroupware.org>               *
   * Handles multi-language support using flat files                          *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.translation_sql.inc.php b/phpgwapi/inc/class.translation_sql.inc.php
index 70e834da6a..3509d0fa32 100644
--- a/phpgwapi/inc/class.translation_sql.inc.php
+++ b/phpgwapi/inc/class.translation_sql.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Translation class for SQL                             *
+  * eGroupWare API - Translation class for SQL                               *
   * This file written by Joseph Engo <jengo@phpgroupware.org>                *
   * and Dan Kuykendall <seek3r@phpgroupware.org>                             *
   * Handles multi-language support use SQL tables                            *
   * Copyright (C) 2000, 2001 Joseph Engo                                     *
   * ------------------------------------------------------------------------ *
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          *
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            *
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.utilities.inc.php b/phpgwapi/inc/class.utilities.inc.php
index 26b1fb61d2..7d5718e776 100644
--- a/phpgwapi/inc/class.utilities.inc.php
+++ b/phpgwapi/inc/class.utilities.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Utilies loader                                        *
+  * eGroupWare API - Utilies loader                                          *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * This simply loads up additional utility libraries                        *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.validator.inc.php b/phpgwapi/inc/class.validator.inc.php
index 77ca1ee451..18d8619bbf 100644
--- a/phpgwapi/inc/class.validator.inc.php
+++ b/phpgwapi/inc/class.validator.inc.php
@@ -1,11 +1,11 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - Validator                                             *
+  * eGroupWare API - Validator                                               *
   * This file written by Dave Hall <skwashd@phpgroupware.org>                *
   * Copyright (C) 2003 Free Software Foundation                              *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   *  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   *
@@ -293,8 +293,8 @@
 			echo 'definition</a> , therefore it has been removed. <br><br>';
 			echo 'If you are a application maintainer, please update your app. ';
 			echo 'If you are a user, please file a bug report on ';
-			echo '<a href="https://savannah.gnu.org/bugs/?group=phpgroupware">';
-			echo 'our project page at savannah.gnu.org</a>. Please copy and paste ';
+			echo '<a href="http://sourceforge.net/projects/egroupwaregroup">';
+			echo 'our project page at sourceforge.net</a>. Please copy and paste ';
 			echo 'the following information into the bug report:<br>';
 			echo '<b>Summary<b>: ' . $GLOBALS['phpgw_info']['flags']['currentapp'];
 			echo 'calls class.validator.inc.php';
diff --git a/phpgwapi/inc/class.vfs_dav.inc.php b/phpgwapi/inc/class.vfs_dav.inc.php
index ef86b19552..cb57138073 100644
--- a/phpgwapi/inc/class.vfs_dav.inc.php
+++ b/phpgwapi/inc/class.vfs_dav.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - VFS                                                   *
+  * eGroupWare API - VFS                                                     *
   * This file written by Jason Wies (Zone) <zone@phpgroupware.org>           *
-  * This class handles file/dir access for phpGroupWare                      *
-  * Copyright (C) 2001-2003 Jason Wies, Jonathon Sim		                 *
+  * This class handles file/dir access for eGroupWare                        *
+  * Copyright (C) 2001-2003 Jason Wies, Jonathon Sim		             *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.vfs_shared.inc.php b/phpgwapi/inc/class.vfs_shared.inc.php
index 5f66efc487..f1ebc3eee8 100644
--- a/phpgwapi/inc/class.vfs_shared.inc.php
+++ b/phpgwapi/inc/class.vfs_shared.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - VFS base class                                        *
+  * eGroupWare API - VFS base class                                          *
   * This file written by Jason Wies (Zone) <zone@phpgroupware.org>           *
-  * This class handles file/dir access for phpGroupWare                      *
+  * This class handles file/dir access for eGroupWare                        *
   * Copyright (C) 2001 Jason Wies		                             *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/class.vfs_sql.inc.php b/phpgwapi/inc/class.vfs_sql.inc.php
index 973271bb1d..b750575fe6 100644
--- a/phpgwapi/inc/class.vfs_sql.inc.php
+++ b/phpgwapi/inc/class.vfs_sql.inc.php
@@ -1,12 +1,12 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - VFS                                                   *
+  * eGroupWare API - VFS                                                     *
   * This file written by Jason Wies (Zone) <zone@phpgroupware.org>           *
-  * This class handles file/dir access for phpGroupWare                      *
+  * This class handles file/dir access for eGroupWare                        *
   * Copyright (C) 2001 Jason Wies		                             *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php
index 07fc399009..521f4134b6 100755
--- a/phpgwapi/inc/common_functions.inc.php
+++ b/phpgwapi/inc/common_functions.inc.php
@@ -1,13 +1,13 @@
 <?php
 	 /**************************************************************************\
-	 * phpGroupWare API - phpgwapi loader                                       *
+	 * eGroupWare API - phpgwapi loader                                         *
 	 * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
 	 * and Joseph Engo <jengo@phpgroupware.org>                                 *
 	 * Has a few functions, but primary role is to load the phpgwapi            *
 	 * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
 	 * -------------------------------------------------------------------------*
-	 * This library is part of the phpGroupWare API                             *
-	 * http://www.phpgroupware.org/api                                          * 
+	 * This library is part of the eGroupWare API                               *
+	 * http://www.egroupware.org/api                                            * 
 	 * ------------------------------------------------------------------------ *
 	 * 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/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php
index c85c145634..602a8cb8c2 100644
--- a/phpgwapi/inc/footer.inc.php
+++ b/phpgwapi/inc/footer.inc.php
@@ -1,13 +1,13 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare API - phpgwapi footer                                       *
+  * eGroupWare API - phpgwapi footer                                         *
   * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
   * and Joseph Engo <jengo@phpgroupware.org>                                 *
   * Closes out interface and db connections                                  *
   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
   * -------------------------------------------------------------------------*
-  * This library is part of the phpGroupWare API                             *
-  * http://www.phpgroupware.org/api                                          * 
+  * This library is part of the eGroupWare API                               *
+  * http://www.egroupware.org/api                                            * 
   * ------------------------------------------------------------------------ *
   * 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/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index de1c6dc827..9019f8779a 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -1,13 +1,13 @@
 <?php
 	 /**************************************************************************\
-	 * phpGroupWare API - phpgwapi loader                                       *
+	 * eGroupWare API - phpgwapi loader                                         *
 	 * This file written by Dan Kuykendall <seek3r@phpgroupware.org>            *
 	 * and Joseph Engo <jengo@phpgroupware.org>                                 *
 	 * Has a few functions, but primary role is to load the phpgwapi            *
 	 * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
 	 * -------------------------------------------------------------------------*
-	 * This library is part of the phpGroupWare API                             *
-	 * http://www.phpgroupware.org/api                                          *
+	 * This library is part of the eGroupWare API                               *
+	 * http://www.egroupware.org/api                                            *
 	 * ------------------------------------------------------------------------ *
 	 * 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/phpgwapi/inc/xmlrpc.interop.php b/phpgwapi/inc/xmlrpc.interop.php
index f907000111..562ed4bb52 100644
--- a/phpgwapi/inc/xmlrpc.interop.php
+++ b/phpgwapi/inc/xmlrpc.interop.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare xmlrpc server                                               *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare xmlrpc server                                                 *
+  * http://www.egroupware.org                                                *
   * Written by Dan Kuykendall <dan@kuykendall.org>                           *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *