diff --git a/setup/applications.php b/setup/applications.php
index ce2c6c9d4d..0a8c11e8a7 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/applist.php b/setup/applist.php
index e415429247..9705b628e8 100644
--- a/setup/applist.php
+++ b/setup/applist.php
@@ -1,7 +1,7 @@
 <?php
 /**************************************************************************\
-* phpGroupWare - XML-RPC Test App                                          *
-* http://www.phpgroupware.org                                              *
+* eGroupWare - XML-RPC Test App                                            *
+* 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/setup/check_install.php b/setup/check_install.php
index f39bc50fab..c2ab1028a6 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -1,6 +1,6 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup Check Installation                                  *
+  * eGroupWare - Setup Check Installation                                    *
   * http://www.eGroupWare.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/setup/config.php b/setup/config.php
index ab83806617..46f4eaa511 100644
--- a/setup/config.php
+++ b/setup/config.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/doc/README.inc b/setup/doc/README.inc
index e699d19ac6..e9244734bb 100644
--- a/setup/doc/README.inc
+++ b/setup/doc/README.inc
@@ -1,4 +1,4 @@
-phpGroupWare setup		March 2002 revised (5-2001)
+eGroupWare setup		March 2002 revised (5-2001)
 
 Note: All setup classes are now located in the phpgwapi module.  Since setup
       cannot work without the api anyway, these classes were moved.
diff --git a/setup/doc/setup3.lyx b/setup/doc/setup3.lyx
index d681b2b511..091cd69202 100644
--- a/setup/doc/setup3.lyx
+++ b/setup/doc/setup3.lyx
@@ -27,7 +27,7 @@
 
 \layout Title
 \added_space_top vfill \added_space_bottom vfill 
-phpGroupWare Setup
+eGroupWare Setup
 \layout Date
 
 June 18, 2001 
@@ -39,7 +39,7 @@ June 18, 2001
 \layout Abstract
 
 A developer introduction to using the next generation setup application
- for phpgroupware.
+ for egroupware.
 \layout Section
 
 Introduction
@@ -51,7 +51,7 @@ Welcome
 
 \series medium 
 Thanks for taking the time to look over this document.
- If you are a developer who is new to phpgroupware, this document will be
+ If you are a developer who is new to egroupware, this document will be
  invaluable to your success during the life of your application.
  This is in addition to the other fine documentation available in the phpgwapi/d
 oc directory in your install.
@@ -93,7 +93,7 @@ Setup3 adds multi-language support for the setup application, a long missed
 \series medium 
 Setup3 gives each application developer control over their application install
  and upgrade processes, while giving them access to work within a realm
- formerly owned by only the former core phpgroupware applications.
+ formerly owned by only the former core egroupware applications.
  Yes, this is extra work for the developer.
  But it is hoped that setup3 is also viewed as a tool that can truly enhance
  the development process
@@ -155,7 +155,7 @@ $setup_info['addressbook']['enable'] = 1;
 
 
 \series medium 
-'name' is used throughout phpgroupware, typically in $phpgw_info flags such
+'name' is used throughout egroupware, typically in $phpgw_info flags such
  as 'currentapp' or as the 'app_name' almost everywhere else.
 \layout Standard
 
@@ -187,7 +187,7 @@ The 'version' string defines the version of the application and table code.
 
 
 \series medium 
-The 'enable' string is used by the phpgroupware API to determine whether
+The 'enable' string is used by the egroupware API to determine whether
  an application is disabled, enabled, or enabled but hidden from the navbar.
  Most applications will want this set to a value of 1 (enabled).
  The notifywindow app sets this to 2, which keeps it off the navbar.
@@ -334,7 +334,7 @@ $setup_info['addressbook']['depends'][] = array(
 
 
 \series medium 
-This is the standard dependency array for all phpgroupware applications.
+This is the standard dependency array for all egroupware applications.
  It states that this application requires the phpgwapi, and lists the versions
  with which versions this app is compatible.
  This list would need to be appended upon each new API release, assuming
@@ -515,7 +515,7 @@ Any application which requires an upgrade to a previous version's tables
 This file will be the most complex of all setup-oriented files with which
  you will be working.
  It will contain all upgrade functions capable of upgrading any possible
- version of your phpgroupware app.
+ version of your egroupware app.
  These upgrade routines roughly match the old setup program's upgrade functions,
  but the use of objects and the methods have changed dramatically.
  The simplest version upgrade routine would look like:
diff --git a/setup/doc/setup3.sgml b/setup/doc/setup3.sgml
index de0fcbe5c1..03e35b8c73 100644
--- a/setup/doc/setup3.sgml
+++ b/setup/doc/setup3.sgml
@@ -8,7 +8,7 @@
   See http://www.lyx.org/ for more information -->
   <artheader>
    <title>
-   phpGroupWare Setup
+   eGroupWare Setup
   </title>
   <date>
    June 18, 2001 
@@ -18,7 +18,7 @@
   </author>
   <abstract>
   <para>
-   A developer introduction to using the next generation setup application for phpgroupware.
+   A developer introduction to using the next generation setup application for egroupware.
   </para>
   </abstract>
   </artheader>
@@ -31,7 +31,7 @@
     Welcome
    </title>
    <para>
-    Thanks for taking the time to look over this document. If you are a developer who is new to phpgroupware, this document will be invaluable to your success during the life of your application. This is in addition to the other fine documentation available in the phpgwapi/doc directory in your install. Even long-time phpgw developers should benefit this document. Herein, I will attempt to outline the critical steps required in order to get along with setup3, setup-TNG, or whatever we end up calling it (Hey, how about 'setup'?)
+    Thanks for taking the time to look over this document. If you are a developer who is new to egroupware, this document will be invaluable to your success during the life of your application. This is in addition to the other fine documentation available in the phpgwapi/doc directory in your install. Even long-time phpgw developers should benefit this document. Herein, I will attempt to outline the critical steps required in order to get along with setup3, setup-TNG, or whatever we end up calling it (Hey, how about 'setup'?)
    </para>
    </sect2>
    <sect2>
@@ -48,7 +48,7 @@
     Setup3 adds multi-language support for the setup application, a long missed feature, I would imagine.
    </para>
    <para>
-    Setup3 gives each application developer control over their application install and upgrade processes, while giving them access to work within a realm formerly owned by only the former core phpgroupware applications. Yes, this is extra work for the developer. But it is hoped that setup3 is also viewed as a tool that can truly enhance the development process.
+    Setup3 gives each application developer control over their application install and upgrade processes, while giving them access to work within a realm formerly owned by only the former core egroupware applications. Yes, this is extra work for the developer. But it is hoped that setup3 is also viewed as a tool that can truly enhance the development process.
    </para>
    <para>
     OK. Let's dive right in...
@@ -84,7 +84,7 @@
 ]]><![ CDATA [$setup_info['addressbook']['enable'] = 1;
 ]]>    </programlisting>
     <para>
-     'name' is used throughout phpgroupware, typically in &dollar;phpgw_info flags such as 'currentapp' or as the 'app_name' almost everywhere else.
+     'name' is used throughout egroupware, typically in &dollar;phpgw_info flags such as 'currentapp' or as the 'app_name' almost everywhere else.
     </para>
     <para>
      'title' would be used in the navbar, admin, preferences, as well as in the application itself.
@@ -96,7 +96,7 @@
      'app_order' determines the order of applications in the navbar. If the number you set here is the same as is set for another app, the app whose 'name' is first in the English alphabet would appear first. Smaller numbers show closer to the top or left end of the navbar, depending upon the layout.
     </para>
     <para>
-     The 'enable' string is used by the phpgroupware API to determine whether an application is disabled, enabled, or enabled but hidden from the navbar. Most applications will want this set to a value of 1 (enabled). The notifywindow app sets this to 2, which keeps it off the navbar. An enable of 0 would disable the app by default. There is one other special case, 3, which is used primarily by the API itself. From the perspective of setup3, the API is an application just like any other application. By setting the 'enable' flag to 3, the API is still enabled, but will not be assignable to a user as a real application. It will thereby be hidden from the admin for application and user/group editing.
+     The 'enable' string is used by the egroupware API to determine whether an application is disabled, enabled, or enabled but hidden from the navbar. Most applications will want this set to a value of 1 (enabled). The notifywindow app sets this to 2, which keeps it off the navbar. An enable of 0 would disable the app by default. There is one other special case, 3, which is used primarily by the API itself. From the perspective of setup3, the API is an application just like any other application. By setting the 'enable' flag to 3, the API is still enabled, but will not be assignable to a user as a real application. It will thereby be hidden from the admin for application and user/group editing.
     </para>
     </sect3>
     <sect3>
@@ -164,7 +164,7 @@
 ]]><![ CDATA [);
 ]]>     </programlisting>
      <para>
-      This is the standard dependency array for all phpgroupware applications. It states that this application requires the phpgwapi, and lists the versions with which versions this app is compatible. This list would need to be appended upon each new API release, assuming your application is compatible with this new API version. You may list other applications here, e.g. your app might depend upon 'email' in order to work properly.
+      This is the standard dependency array for all egroupware applications. It states that this application requires the phpgwapi, and lists the versions with which versions this app is compatible. This list would need to be appended upon each new API release, assuming your application is compatible with this new API version. You may list other applications here, e.g. your app might depend upon 'email' in order to work properly.
      </para>
      <para>
       Do NOT list applications here without considering this: If you do list an application here, and your app does not really require it, your application will not install unless that other application is already installed. This is handled normally within the install/upgrade process loops, which will install only applications whose dependencies are satisfied. Using a multipass function, the applications are installed in the correct order to ensure that dependencies are resolved. In all cases, the API would be installed first in every new install or upgrade, since all applications depend on the API.
@@ -231,7 +231,7 @@
      Any application which requires an upgrade to a previous version's tables will need this file.
     </title>
     <para>
-     This file will be the most complex of all setup-oriented files with which you will be working. It will contain all upgrade functions capable of upgrading any possible version of your phpgroupware app. These upgrade routines roughly match the old setup program's upgrade functions, but the use of objects and the methods have changed dramatically. The simplest version upgrade routine would look like:
+     This file will be the most complex of all setup-oriented files with which you will be working. It will contain all upgrade functions capable of upgrading any possible version of your egroupware app. These upgrade routines roughly match the old setup program's upgrade functions, but the use of objects and the methods have changed dramatically. The simplest version upgrade routine would look like:
     </para>
     <programlisting>
 <![ CDATA [$test[] = "0.9.3pre10";
diff --git a/setup/doc/setup3.txt b/setup/doc/setup3.txt
index be764ec7f7..7839c3c6f3 100644
--- a/setup/doc/setup3.txt
+++ b/setup/doc/setup3.txt
@@ -1,6 +1,6 @@
 
 
-phpGroupWare Setup
+eGroupWare Setup
 
 June 18, 2001 
 Updated May 9, 2003
@@ -9,14 +9,14 @@ Updated May 9, 2003
 Abstract
 
 A developer introduction to using the next generation setup
-application for phpgroupware.
+application for egroupware.
 
 1 Introduction
 
 1.1 Welcome
 
 Thanks for taking the time to look over this document. If
-you are a developer who is new to phpgroupware, this document
+you are a developer who is new to egroupware, this document
 will be invaluable to your success during the life of your
 application. This is in addition to the other fine documentation
 available in the phpgwapi/doc directory in your install.
@@ -46,7 +46,7 @@ a long missed feature, I would imagine.
 Setup3 gives each application developer control over their
 application install and upgrade processes, while giving
 them access to work within a realm formerly owned by only
-the former core phpgroupware applications. Yes, this is
+the former core egroupware applications. Yes, this is
 extra work for the developer. But it is hoped that setup3
 is also viewed as a tool that can truly enhance the development
 process.
@@ -79,7 +79,7 @@ $setup_info['addressbook']['app_order'] = 4;
 
 $setup_info['addressbook']['enable'] = 1;
 
-'name' is used throughout phpgroupware, typically in $phpgw_info
+'name' is used throughout egroupware, typically in $phpgw_info
 flags such as 'currentapp' or as the 'app_name' almost everywhere
 else.
 
@@ -101,7 +101,7 @@ app, the app whose 'name' is first in the English alphabet
 would appear first. Smaller numbers show closer to the top
 or left end of the navbar, depending upon the layout.
 
-The 'enable' string is used by the phpgroupware API to determine
+The 'enable' string is used by the egroupware API to determine
 whether an application is disabled, enabled, or enabled
 but hidden from the navbar. Most applications will want
 this set to a value of 1 (enabled). The notifywindow app
@@ -180,7 +180,7 @@ $setup_info['addressbook']['depends'][] = array(
 
 );
 
-This is the standard dependency array for all phpgroupware
+This is the standard dependency array for all egroupware
 applications. It states that this application requires the
 phpgwapi, and lists the versions with which versions this
 app is compatible. This list would need to be appended upon
@@ -290,7 +290,7 @@ then recreate the current file to match the new table definitions.
 This file will be the most complex of all setup-oriented
 files with which you will be working. It will contain all
 upgrade functions capable of upgrading any possible version
-of your phpgroupware app. These upgrade routines roughly
+of your egroupware app. These upgrade routines roughly
 match the old setup program's upgrade functions, but the
 use of objects and the methods have changed dramatically.
 The simplest version upgrade routine would look like:
diff --git a/setup/inc/class.Template.inc.php b/setup/inc/class.Template.inc.php
index 6796b8cdcb..26cdad2a24 100644
--- a/setup/inc/class.Template.inc.php
+++ b/setup/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 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/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index 3d186342db..8f54b002ff 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.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/setup/inc/hook_config.inc.php b/setup/inc/hook_config.inc.php
index 518223af37..4cd717ac35 100644
--- a/setup/inc/hook_config.inc.php
+++ b/setup/inc/hook_config.inc.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
   * Written by Miles Lott <milos@groupwhere.org>                             *
   * ------------------------------------------------------------------------ *
   *  This program is free software; you can redistribute it and/or modify it *
diff --git a/setup/index.php b/setup/index.php
index a7b4b038d1..e223d98586 100644
--- a/setup/index.php
+++ b/setup/index.php
@@ -1,7 +1,7 @@
 <?php
 	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
+	* eGroupWare                                                               *
+	* http://www.egroupware.org                                                *
 	* --------------------------------------------                             *
 	*  This program is free software; you can redistribute it and/or modify it *
 	*  under the terms of the GNU General Public License as published by the   *
diff --git a/setup/lang.php b/setup/lang.php
index 516b388599..4b2179f077 100644
--- a/setup/lang.php
+++ b/setup/lang.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/ldap.php b/setup/ldap.php
index 58ddc877e1..dbf23eefbb 100644
--- a/setup/ldap.php
+++ b/setup/ldap.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/ldapexport.php b/setup/ldapexport.php
index 55431a0d9e..162c272f3d 100644
--- a/setup/ldapexport.php
+++ b/setup/ldapexport.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/ldapimport.php b/setup/ldapimport.php
index 2bd66eaed7..a04d62c5b5 100644
--- a/setup/ldapimport.php
+++ b/setup/ldapimport.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/ldapmodify.php b/setup/ldapmodify.php
index 46d739e9e8..587c68b40f 100644
--- a/setup/ldapmodify.php
+++ b/setup/ldapmodify.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup                                                     *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup                                                       *
+  * 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/setup/manageheader.php b/setup/manageheader.php
index b0be957689..4210a28a2e 100644
--- a/setup/manageheader.php
+++ b/setup/manageheader.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *
diff --git a/setup/schematoy.php b/setup/schematoy.php
index 1442e8c805..bd4284454b 100644
--- a/setup/schematoy.php
+++ b/setup/schematoy.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare - Setup - Developer tools                                   *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare - Setup - Developer tools                                     *
+  * 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/setup/setup_demo.php b/setup/setup_demo.php
index 7365f08234..1dae4d936d 100644
--- a/setup/setup_demo.php
+++ b/setup/setup_demo.php
@@ -1,7 +1,7 @@
 <?php
   /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
+  * eGroupWare                                                               *
+  * http://www.egroupware.org                                                *
   * --------------------------------------------                             *
   *  This program is free software; you can redistribute it and/or modify it *
   *  under the terms of the GNU General Public License as published by the   *