diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
new file mode 100644
index 00000000..79859e06
--- /dev/null
+++ b/COPYRIGHT.txt
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 00000000..e1f9ad7b
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/bootstrap.py b/bootstrap.py
index b5b9c133..97e71474 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/setup.py b/setup.py
index e2e3b84f..92a076aa 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -31,7 +31,7 @@
       version = '3.12.4dev',
       url='http://pypi.python.org/pypi/zope.publisher',
       license='ZPL 2.1',
-      author='Zope Corporation and Contributors',
+      author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description="The Zope publisher publishes Python objects on the web.",
       long_description=(open('README.txt').read()
diff --git a/src/zope/publisher/base.py b/src/zope/publisher/base.py
index 54f8d29f..ecab08fa 100644
--- a/src/zope/publisher/base.py
+++ b/src/zope/publisher/base.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/browser.py b/src/zope/publisher/browser.py
index 9375d6e5..f31d2f18 100644
--- a/src/zope/publisher/browser.py
+++ b/src/zope/publisher/browser.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/contenttype.py b/src/zope/publisher/contenttype.py
index 7daf23c2..2ad74184 100644
--- a/src/zope/publisher/contenttype.py
+++ b/src/zope/publisher/contenttype.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/defaultview.py b/src/zope/publisher/defaultview.py
index 1734acb6..6b412469 100644
--- a/src/zope/publisher/defaultview.py
+++ b/src/zope/publisher/defaultview.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/ftp.py b/src/zope/publisher/ftp.py
index 8de92977..5281659c 100644
--- a/src/zope/publisher/ftp.py
+++ b/src/zope/publisher/ftp.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/http.py b/src/zope/publisher/http.py
index 49d27fa7..fa6d2c0e 100644
--- a/src/zope/publisher/http.py
+++ b/src/zope/publisher/http.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/__init__.py b/src/zope/publisher/interfaces/__init__.py
index 4f9c7f26..be7d53c6 100644
--- a/src/zope/publisher/interfaces/__init__.py
+++ b/src/zope/publisher/interfaces/__init__.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001-2009 Zope Corporation and Contributors.
+# Copyright (c) 2001-2009 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/browser.py b/src/zope/publisher/interfaces/browser.py
index cb1cb6ab..4e920013 100644
--- a/src/zope/publisher/interfaces/browser.py
+++ b/src/zope/publisher/interfaces/browser.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/ftp.py b/src/zope/publisher/interfaces/ftp.py
index 72893625..071732b0 100644
--- a/src/zope/publisher/interfaces/ftp.py
+++ b/src/zope/publisher/interfaces/ftp.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/http.py b/src/zope/publisher/interfaces/http.py
index d4fb4b56..fc3feaec 100644
--- a/src/zope/publisher/interfaces/http.py
+++ b/src/zope/publisher/interfaces/http.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/logginginfo.py b/src/zope/publisher/interfaces/logginginfo.py
index 71087f48..f58cd60d 100644
--- a/src/zope/publisher/interfaces/logginginfo.py
+++ b/src/zope/publisher/interfaces/logginginfo.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/interfaces/xmlrpc.py b/src/zope/publisher/interfaces/xmlrpc.py
index 02f0338f..c2dd0e15 100644
--- a/src/zope/publisher/interfaces/xmlrpc.py
+++ b/src/zope/publisher/interfaces/xmlrpc.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/principallogging.py b/src/zope/publisher/principallogging.py
index 91303058..786423cc 100644
--- a/src/zope/publisher/principallogging.py
+++ b/src/zope/publisher/principallogging.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/publish.py b/src/zope/publisher/publish.py
index e7a264ba..0a27ee8d 100644
--- a/src/zope/publisher/publish.py
+++ b/src/zope/publisher/publish.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002, 2003 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002, 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/skinnable.py b/src/zope/publisher/skinnable.py
index 238adaf3..9724b24b 100644
--- a/src/zope/publisher/skinnable.py
+++ b/src/zope/publisher/skinnable.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/basetestiapplicationrequest.py b/src/zope/publisher/tests/basetestiapplicationrequest.py
index 5424338c..4a2c8db5 100644
--- a/src/zope/publisher/tests/basetestiapplicationrequest.py
+++ b/src/zope/publisher/tests/basetestiapplicationrequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/basetestipublicationrequest.py b/src/zope/publisher/tests/basetestipublicationrequest.py
index 0a5cd1e9..91c95e3d 100644
--- a/src/zope/publisher/tests/basetestipublicationrequest.py
+++ b/src/zope/publisher/tests/basetestipublicationrequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/basetestipublisherrequest.py b/src/zope/publisher/tests/basetestipublisherrequest.py
index c3c516fc..cd0bf942 100644
--- a/src/zope/publisher/tests/basetestipublisherrequest.py
+++ b/src/zope/publisher/tests/basetestipublisherrequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/httprequest.py b/src/zope/publisher/tests/httprequest.py
index d6b96595..aa051dca 100644
--- a/src/zope/publisher/tests/httprequest.py
+++ b/src/zope/publisher/tests/httprequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/publication.py b/src/zope/publisher/tests/publication.py
index 1d93e6c6..584e0277 100644
--- a/src/zope/publisher/tests/publication.py
+++ b/src/zope/publisher/tests/publication.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_baserequest.py b/src/zope/publisher/tests/test_baserequest.py
index 98d032d3..57d676d5 100644
--- a/src/zope/publisher/tests/test_baserequest.py
+++ b/src/zope/publisher/tests/test_baserequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_baseresponse.py b/src/zope/publisher/tests/test_baseresponse.py
index e1af185b..73af8a29 100644
--- a/src/zope/publisher/tests/test_baseresponse.py
+++ b/src/zope/publisher/tests/test_baseresponse.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_browser.py b/src/zope/publisher/tests/test_browser.py
index ab13c0ff..087835a3 100644
--- a/src/zope/publisher/tests/test_browser.py
+++ b/src/zope/publisher/tests/test_browser.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors.
+# Copyright (c) 2004 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_browserlanguages.py b/src/zope/publisher/tests/test_browserlanguages.py
index 2bc1e0ed..26d663ad 100644
--- a/src/zope/publisher/tests/test_browserlanguages.py
+++ b/src/zope/publisher/tests/test_browserlanguages.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_browserrequest.py b/src/zope/publisher/tests/test_browserrequest.py
index 2e4cd2fa..7ce94624 100644
--- a/src/zope/publisher/tests/test_browserrequest.py
+++ b/src/zope/publisher/tests/test_browserrequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_browserresponse.py b/src/zope/publisher/tests/test_browserresponse.py
index 52230fd0..3f719e20 100644
--- a/src/zope/publisher/tests/test_browserresponse.py
+++ b/src/zope/publisher/tests/test_browserresponse.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_defaultview.py b/src/zope/publisher/tests/test_defaultview.py
index 418966d0..50e44796 100644
--- a/src/zope/publisher/tests/test_defaultview.py
+++ b/src/zope/publisher/tests/test_defaultview.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_ftp.py b/src/zope/publisher/tests/test_ftp.py
index f283c4b3..580d9e55 100644
--- a/src/zope/publisher/tests/test_ftp.py
+++ b/src/zope/publisher/tests/test_ftp.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_http.py b/src/zope/publisher/tests/test_http.py
index a8abd057..d62c2144 100644
--- a/src/zope/publisher/tests/test_http.py
+++ b/src/zope/publisher/tests/test_http.py
@@ -1,7 +1,7 @@
 # -*- coding: latin-1 -*-
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_httpcharsets.py b/src/zope/publisher/tests/test_httpcharsets.py
index 73c6d40c..77fc1d3a 100644
--- a/src/zope/publisher/tests/test_httpcharsets.py
+++ b/src/zope/publisher/tests/test_httpcharsets.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_ipublication.py b/src/zope/publisher/tests/test_ipublication.py
index 4ecafda6..34780864 100644
--- a/src/zope/publisher/tests/test_ipublication.py
+++ b/src/zope/publisher/tests/test_ipublication.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_mapply.py b/src/zope/publisher/tests/test_mapply.py
index e8624213..6f8ec6f2 100644
--- a/src/zope/publisher/tests/test_mapply.py
+++ b/src/zope/publisher/tests/test_mapply.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_principallogging.py b/src/zope/publisher/tests/test_principallogging.py
index b1d0f0e5..28a994bd 100644
--- a/src/zope/publisher/tests/test_principallogging.py
+++ b/src/zope/publisher/tests/test_principallogging.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_publisher.py b/src/zope/publisher/tests/test_publisher.py
index dd5f058b..d5b764a5 100644
--- a/src/zope/publisher/tests/test_publisher.py
+++ b/src/zope/publisher/tests/test_publisher.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_requestdataproperty.py b/src/zope/publisher/tests/test_requestdataproperty.py
index 21c8a79e..6449c967 100644
--- a/src/zope/publisher/tests/test_requestdataproperty.py
+++ b/src/zope/publisher/tests/test_requestdataproperty.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_skinnable.py b/src/zope/publisher/tests/test_skinnable.py
index 845f9c21..9407d5dd 100644
--- a/src/zope/publisher/tests/test_skinnable.py
+++ b/src/zope/publisher/tests/test_skinnable.py
@@ -1,7 +1,7 @@
 # -*- coding: latin-1 -*-
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_xmlrpc.py b/src/zope/publisher/tests/test_xmlrpc.py
index 46ecba07..644c727d 100644
--- a/src/zope/publisher/tests/test_xmlrpc.py
+++ b/src/zope/publisher/tests/test_xmlrpc.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors.
+# Copyright (c) 2004 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_xmlrpcrequest.py b/src/zope/publisher/tests/test_xmlrpcrequest.py
index 50fb429a..07c0fe0f 100644
--- a/src/zope/publisher/tests/test_xmlrpcrequest.py
+++ b/src/zope/publisher/tests/test_xmlrpcrequest.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/test_zcml.py b/src/zope/publisher/tests/test_zcml.py
index 44150a64..f1c31bf7 100644
--- a/src/zope/publisher/tests/test_zcml.py
+++ b/src/zope/publisher/tests/test_zcml.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/views.py b/src/zope/publisher/tests/views.py
index 43a2bf84..1d0ed484 100644
--- a/src/zope/publisher/tests/views.py
+++ b/src/zope/publisher/tests/views.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/tests/xmlrpcviews.py b/src/zope/publisher/tests/xmlrpcviews.py
index eefbfcc2..3cebd58d 100644
--- a/src/zope/publisher/tests/xmlrpcviews.py
+++ b/src/zope/publisher/tests/xmlrpcviews.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/xmlrpc.py b/src/zope/publisher/xmlrpc.py
index 1d932f23..bf5db580 100644
--- a/src/zope/publisher/xmlrpc.py
+++ b/src/zope/publisher/xmlrpc.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/zope/publisher/zcml.py b/src/zope/publisher/zcml.py
index b7f51269..1857749f 100644
--- a/src/zope/publisher/zcml.py
+++ b/src/zope/publisher/zcml.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,