diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 32b0177c511530fd50f5c5d9a196c90a7f1828b4..79859e06010bf4967c5b4b044afea6ef39742938 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,9 +1 @@
-Copyright (c) 2004 Zope Corporation and Contributors.
-All Rights Reserved.
-
-This software is subject to the provisions of the Zope Public License,
-Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-FOR A PARTICULAR PURPOSE.
+Zope Foundation and Contributors
\ No newline at end of file
diff --git a/LICENSE.txt b/LICENSE.txt
index 0f06d960d86070b7b020bd872f3a8b056788915d..e1f9ad7b3b48377bfbfaa1b380c384ddea24060f 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,54 +1,44 @@
 Zope Public License (ZPL) Version 2.1
--------------------------------------
 
-A copyright notice accompanies this license document that
-identifies the copyright holders.
+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).
+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:
+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.
+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.
+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.
+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.
+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.
+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.
+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 b5b9c133752ba6bc45dc1e8b92d874296e560f2b..97e71474b4833b2fcc0870e00ab7c545e4b48dbf 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 35b7586cb9e82e899097ff1ba8e0b69175b358c6..0098231e832302a44d8ce3a5b022b18a54c6881d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002, 2003 Zope Corporation and Contributors.
+# Copyright (c) 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/BTrees/BTreeItemsTemplate.c b/src/BTrees/BTreeItemsTemplate.c
index cb245ad280638fe8f805459e472eee86c6ca6997..93c1df8f9f737f377f874e6f8729b019f77796c3 100644
--- a/src/BTrees/BTreeItemsTemplate.c
+++ b/src/BTrees/BTreeItemsTemplate.c
@@ -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/BTrees/BTreeModuleTemplate.c b/src/BTrees/BTreeModuleTemplate.c
index e0d2d87a34874cf1f9380247645be13ecd2c650d..eb839dee71d4396118955236d6ac4961f81c5608 100644
--- a/src/BTrees/BTreeModuleTemplate.c
+++ b/src/BTrees/BTreeModuleTemplate.c
@@ -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/BTrees/BTreeTemplate.c b/src/BTrees/BTreeTemplate.c
index 0f48d04e94214983611d22b4d740c184ea8435f2..cb056ebdde9b9ac53943da506e260080b70ff1a9 100644
--- a/src/BTrees/BTreeTemplate.c
+++ b/src/BTrees/BTreeTemplate.c
@@ -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/BTrees/BucketTemplate.c b/src/BTrees/BucketTemplate.c
index e87c150faf1dbb22783cb5ca6117921e38565e81..d2a09b0ca66885d40778bf89f8c107e36402de4b 100644
--- a/src/BTrees/BucketTemplate.c
+++ b/src/BTrees/BucketTemplate.c
@@ -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/BTrees/IFBTree.py b/src/BTrees/IFBTree.py
index d05165a19adef21c11f242013a89176c64bb7890..d2eeb5612ac0eb55bc2ea89021ec00a3309b1985 100644
--- a/src/BTrees/IFBTree.py
+++ b/src/BTrees/IFBTree.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/BTrees/IIBTree.py b/src/BTrees/IIBTree.py
index 1dc30a5f567836f5c8cc137eb064d0833f6fb79a..aa1b6949b143d3391bcae29a5545b621dc856d90 100644
--- a/src/BTrees/IIBTree.py
+++ b/src/BTrees/IIBTree.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/BTrees/IOBTree.py b/src/BTrees/IOBTree.py
index d680e334aa1d3261de455082ed08ffc3cd4ea618..e1c2fb015014b343324865704757eddccefcb59a 100644
--- a/src/BTrees/IOBTree.py
+++ b/src/BTrees/IOBTree.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/BTrees/Interfaces.py b/src/BTrees/Interfaces.py
index c02680c1176ae355e102687ce630f48981625b27..234c55725dae316cee801394c076161c266dc3fb 100644
--- a/src/BTrees/Interfaces.py
+++ b/src/BTrees/Interfaces.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/BTrees/LFBTree.py b/src/BTrees/LFBTree.py
index 8a6e211b44cc8438b8d834d3cc6def7256cf939d..b6a6930600f8032ccefa0d74709716a4b09f2e50 100644
--- a/src/BTrees/LFBTree.py
+++ b/src/BTrees/LFBTree.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/BTrees/LLBTree.py b/src/BTrees/LLBTree.py
index 4cb2224630cb82b986a33e1e0818c231e1a1243d..fcf94e8acb630ae8bfb211142866cfe290cf099d 100644
--- a/src/BTrees/LLBTree.py
+++ b/src/BTrees/LLBTree.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/BTrees/LOBTree.py b/src/BTrees/LOBTree.py
index b6fcfad211dd9e697cd14cc3659f74a2d3e152b8..27c9e9716e7f6ed998775410ea7bb19e44ed7968 100644
--- a/src/BTrees/LOBTree.py
+++ b/src/BTrees/LOBTree.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/BTrees/Length.py b/src/BTrees/Length.py
index 449afd723a3f5ff34413bbb507a07c8f8677fbbf..386cef4123f09374fa6c433d8ae44622daacb9f5 100644
--- a/src/BTrees/Length.py
+++ b/src/BTrees/Length.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/BTrees/MergeTemplate.c b/src/BTrees/MergeTemplate.c
index 96b43a49fca5a39c280e04571697dd393a162f99..63d318e5360ad197a36c93948a1ecf8f2a8f2eb8 100644
--- a/src/BTrees/MergeTemplate.c
+++ b/src/BTrees/MergeTemplate.c
@@ -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/BTrees/OIBTree.py b/src/BTrees/OIBTree.py
index c99232ee52577f7eb939a2cad601018150f80ed9..a4a8616a57c24c6f68a82210693f619f4e640333 100644
--- a/src/BTrees/OIBTree.py
+++ b/src/BTrees/OIBTree.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/BTrees/OLBTree.py b/src/BTrees/OLBTree.py
index 2bf738b13fa2d273590fe3f65910fd401894b5aa..e454685f8d697bff65354953193d2619de5998b6 100644
--- a/src/BTrees/OLBTree.py
+++ b/src/BTrees/OLBTree.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/BTrees/OOBTree.py b/src/BTrees/OOBTree.py
index 916cebc08187829c02dc250acf2b0516e8e91bc9..e0c383bd9e2ba0310b13f5fa91939b92aba148f5 100644
--- a/src/BTrees/OOBTree.py
+++ b/src/BTrees/OOBTree.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/BTrees/SetOpTemplate.c b/src/BTrees/SetOpTemplate.c
index 72386d541e819976c6d55984dc8762dd5c2a7f79..839eb42aa0bdf44827a42f29afc56d67ee91a8c3 100644
--- a/src/BTrees/SetOpTemplate.c
+++ b/src/BTrees/SetOpTemplate.c
@@ -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/BTrees/SetTemplate.c b/src/BTrees/SetTemplate.c
index 56b784f6352c1c33c0a0a46f388ffd30145462e8..c279b93f91d4e9970df8b1a2f66f4efa35249b66 100644
--- a/src/BTrees/SetTemplate.c
+++ b/src/BTrees/SetTemplate.c
@@ -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/BTrees/TreeSetTemplate.c b/src/BTrees/TreeSetTemplate.c
index e87f441acda2afb7ca39979d85ccf7f6f9fed72a..70920de516bea56003ed2e5cdd2ff0b8c587c1f6 100644
--- a/src/BTrees/TreeSetTemplate.c
+++ b/src/BTrees/TreeSetTemplate.c
@@ -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/BTrees/_IFBTree.c b/src/BTrees/_IFBTree.c
index d7a1c162bd2daae16e6a4bf3f1b3bdd3cfaab2a7..a49408a9912cabf7c8b3f67cc9f2ecc3e89f13cf 100644
--- a/src/BTrees/_IFBTree.c
+++ b/src/BTrees/_IFBTree.c
@@ -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/BTrees/_IIBTree.c b/src/BTrees/_IIBTree.c
index b4a00a96ed883b82f1b11f25631e573e08ebca64..a0e2a3aefbea9a3e70107262e425982df8344b56 100644
--- a/src/BTrees/_IIBTree.c
+++ b/src/BTrees/_IIBTree.c
@@ -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/BTrees/_IOBTree.c b/src/BTrees/_IOBTree.c
index 1876cd88c7627742eed282d671701df26090e559..185b9f741e3dc66282bf2b1bdc890ba96216a4af 100644
--- a/src/BTrees/_IOBTree.c
+++ b/src/BTrees/_IOBTree.c
@@ -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/BTrees/_LFBTree.c b/src/BTrees/_LFBTree.c
index 45358c72f4dfb21468dd8405650078be40243f19..5faa3e9a701d3fea8dddd966401ce3a3b3ab128c 100644
--- a/src/BTrees/_LFBTree.c
+++ b/src/BTrees/_LFBTree.c
@@ -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/BTrees/_LLBTree.c b/src/BTrees/_LLBTree.c
index 656c628b53a77c021f3bc979cdd90cc2d91da4e0..c661114a457b501526dc63a722bb0d1ea18750a1 100644
--- a/src/BTrees/_LLBTree.c
+++ b/src/BTrees/_LLBTree.c
@@ -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/BTrees/_LOBTree.c b/src/BTrees/_LOBTree.c
index f61a79bfd1b108a3935005c8f69e96fd31d57bd7..64cdef7e60980f8093f7e3d6911fc6daf22186ca 100644
--- a/src/BTrees/_LOBTree.c
+++ b/src/BTrees/_LOBTree.c
@@ -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/BTrees/_OIBTree.c b/src/BTrees/_OIBTree.c
index 4ee4b4a34ac15da73e8b380b844c957b1633a561..23b7b159d82fcaa3a63bfb08c98a72205377726b 100644
--- a/src/BTrees/_OIBTree.c
+++ b/src/BTrees/_OIBTree.c
@@ -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/BTrees/_OLBTree.c b/src/BTrees/_OLBTree.c
index 0dde64d25ac69a2a212b715f80738569b52eddd8..38df534f1d7ac2feb94ab0d68832ef09fa4356ce 100644
--- a/src/BTrees/_OLBTree.c
+++ b/src/BTrees/_OLBTree.c
@@ -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/BTrees/_OOBTree.c b/src/BTrees/_OOBTree.c
index 92c639d4803ed535cf1cbeaa85822d97925deb8b..fca6a6510e3ba808604307ca1046954810a3afcc 100644
--- a/src/BTrees/_OOBTree.c
+++ b/src/BTrees/_OOBTree.c
@@ -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/BTrees/__init__.py b/src/BTrees/__init__.py
index 55ebdfc43a447f1eadae3b09ae67cbb580da58a7..7ba1b357ff48e01b66b79aa457325c713b3ed583 100644
--- a/src/BTrees/__init__.py
+++ b/src/BTrees/__init__.py
@@ -1,6 +1,6 @@
 #############################################################################
 #
-# Copyright (c) 2007 Zope Corporation and Contributors.
+# Copyright (c) 2007 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/BTrees/_fsBTree.c b/src/BTrees/_fsBTree.c
index 5e93d091b5641105674f2e0df160ceb562523a65..3a6d7631bbf24a767cb0ee142f6f0984f8588069 100644
--- a/src/BTrees/_fsBTree.c
+++ b/src/BTrees/_fsBTree.c
@@ -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/BTrees/check.py b/src/BTrees/check.py
index 765b54e4a0369efb1faba130547c62eb6e381e7e..bf19d4c39a2947ac76a6b02b082d57a0a78a809b 100644
--- a/src/BTrees/check.py
+++ b/src/BTrees/check.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/BTrees/fsBTree.py b/src/BTrees/fsBTree.py
index 3eb7f00ac3e42bf4c67479317fa24a2ed1e06d07..3c8e1987dcf45d3c2b1c76f66d5905f6d42697c7 100644
--- a/src/BTrees/fsBTree.py
+++ b/src/BTrees/fsBTree.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/BTrees/sorters.c b/src/BTrees/sorters.c
index 27aafa4a3e2c21560b8b11915c3b156701420e95..e5cec454d48d8b94114f893d4b97b825efd602c6 100644
--- a/src/BTrees/sorters.c
+++ b/src/BTrees/sorters.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-  Copyright (c) 2002 Zope Corporation and Contributors.
+  Copyright (c) 2002 Zope Foundation and Contributors.
   All Rights Reserved.
 
   This software is subject to the provisions of the Zope Public License,
diff --git a/src/BTrees/tests/testBTrees.py b/src/BTrees/tests/testBTrees.py
index 61fdc1b31d5716de59707fafa69201ae5127ac72..f35b6213e85289911e8e55328bb6173fea63467a 100644
--- a/src/BTrees/tests/testBTrees.py
+++ b/src/BTrees/tests/testBTrees.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/BTrees/tests/testBTreesUnicode.py b/src/BTrees/tests/testBTreesUnicode.py
index 1d27dbee2e1b471cdcc145a9d41ebf0047edbc1d..a22112da99ea3b95037cb383e98db0b48be54e3b 100644
--- a/src/BTrees/tests/testBTreesUnicode.py
+++ b/src/BTrees/tests/testBTreesUnicode.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/BTrees/tests/testConflict.py b/src/BTrees/tests/testConflict.py
index 04007b71129b592199980f059e35f02e7050167c..be6c8986f61cc6080cc6955ad09e0a67386cced8 100644
--- a/src/BTrees/tests/testConflict.py
+++ b/src/BTrees/tests/testConflict.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/BTrees/tests/testLength.py b/src/BTrees/tests/testLength.py
index fb700a158ed1f9fbb8d40aeaf3c16672932d14df..82e6400a2683e026acdc5cab14728e6079f987b0 100644
--- a/src/BTrees/tests/testLength.py
+++ b/src/BTrees/tests/testLength.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Corporation and Contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/BTrees/tests/testSetOps.py b/src/BTrees/tests/testSetOps.py
index 72af492fb8fc1866d3c1bbe3def328ad473982b2..f9aa970694b990ae4438c24d2ba5b50f016d9337 100644
--- a/src/BTrees/tests/testSetOps.py
+++ b/src/BTrees/tests/testSetOps.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/BTrees/tests/test_btreesubclass.py b/src/BTrees/tests/test_btreesubclass.py
index 4ec19509a8a989670ccb082f199ff64df7ae8ef9..2eeb76be3d83623f7ef6d9b2011c4be3e331e124 100644
--- a/src/BTrees/tests/test_btreesubclass.py
+++ b/src/BTrees/tests/test_btreesubclass.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/BTrees/tests/test_check.py b/src/BTrees/tests/test_check.py
index 5f25330140cd31fdaf84075213dba8313f2fb630..b0243b2b7c40f3b7ee3802b3d77691849566daa1 100644
--- a/src/BTrees/tests/test_check.py
+++ b/src/BTrees/tests/test_check.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/BTrees/tests/test_compare.py b/src/BTrees/tests/test_compare.py
index ca1630d9b15e5af4a0d26a2fcb922f3974a77fe6..6381ddb3fc926defcf9ee0737003c64525abc4d9 100644
--- a/src/BTrees/tests/test_compare.py
+++ b/src/BTrees/tests/test_compare.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/ClientStorage.py b/src/ZEO/ClientStorage.py
index 2f5975454e0fbd619f6724ec3997badcb28f01b6..6ac20709217092042f02b0dd15925ce205bfd093 100644
--- a/src/ZEO/ClientStorage.py
+++ b/src/ZEO/ClientStorage.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/ZEO/CommitLog.py b/src/ZEO/CommitLog.py
index d81e50a6bc045fb11402741db238c66db877ad46..a1731e5c5c8caff6a834d660051dcad8546def76 100644
--- a/src/ZEO/CommitLog.py
+++ b/src/ZEO/CommitLog.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/ZEO/Exceptions.py b/src/ZEO/Exceptions.py
index bb7b8ddbc6c41bf3e990c43027785740d98460b5..51ef9f113b59c74c222824463f41ed72814ceac7 100644
--- a/src/ZEO/Exceptions.py
+++ b/src/ZEO/Exceptions.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/ZEO/ServerStub.py b/src/ZEO/ServerStub.py
index 27b4df6b4d46dcd157d5636a528386337b9e4698..4d2e963872ae69a77ee13fad1e7a47178ab98c94 100644
--- a/src/ZEO/ServerStub.py
+++ b/src/ZEO/ServerStub.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/ZEO/StorageServer.py b/src/ZEO/StorageServer.py
index 49e8aee047834fb4ceb61debb35ba5a5340d8874..2b3ccd99f0902e5742b2e8ac6f8ddcf55525fb79 100644
--- a/src/ZEO/StorageServer.py
+++ b/src/ZEO/StorageServer.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/ZEO/TransactionBuffer.py b/src/ZEO/TransactionBuffer.py
index 197b3532320fc0fcb8b66e3b472b8a81d524be83..57767210a0660dbabc5f56e4a656fb75c72a2513 100644
--- a/src/ZEO/TransactionBuffer.py
+++ b/src/ZEO/TransactionBuffer.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/ZEO/__init__.py b/src/ZEO/__init__.py
index c9a004d475c2041438b08404cc4385b90e160a43..0a107e0ca0a952c6543473c9ab0480b3c66d981a 100644
--- a/src/ZEO/__init__.py
+++ b/src/ZEO/__init__.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/ZEO/auth/__init__.py b/src/ZEO/auth/__init__.py
index 1bb5c90cf907aadb882f8be2ea8020a93e2b3eea..588d9903737f51c7ba92d347a9a194b0fd87e3e2 100644
--- a/src/ZEO/auth/__init__.py
+++ b/src/ZEO/auth/__init__.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/ZEO/auth/auth_digest.py b/src/ZEO/auth/auth_digest.py
index caa8045aa7c82f81cbc997e8aea08fe64ab8d00f..400c6ceecad7a9504f1cb9ec16cb908225906661 100644
--- a/src/ZEO/auth/auth_digest.py
+++ b/src/ZEO/auth/auth_digest.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/ZEO/auth/base.py b/src/ZEO/auth/base.py
index 5f4181361808bd711be38b2a912a7c8c40e4b7d3..e340353e958366c07ec5ec417985f2d1f8348334 100644
--- a/src/ZEO/auth/base.py
+++ b/src/ZEO/auth/base.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/ZEO/cache.py b/src/ZEO/cache.py
index b5870fd9a08cd364cc8394bfc654d612c50070e2..2102ed8795032a8e52caa73b073aa797597c51e1 100644
--- a/src/ZEO/cache.py
+++ b/src/ZEO/cache.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/ZEO/hash.py b/src/ZEO/hash.py
index 61a44f9e374703315353dbf224367472544d140b..456b857b287d1f80d67b1e184196abd4308de929 100644
--- a/src/ZEO/hash.py
+++ b/src/ZEO/hash.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Corporation and Contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/interfaces.py b/src/ZEO/interfaces.py
index cb4d1c904ad3f7a666f53c64cd8200a3dd73851d..d75112b9f8e00ac5b7bc2d66ce8031a874ca6ee5 100644
--- a/src/ZEO/interfaces.py
+++ b/src/ZEO/interfaces.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/src/ZEO/mkzeoinst.py b/src/ZEO/mkzeoinst.py
index a3584dd0841d7f734a310c28ec0f013cbaf4b442..6cb892540ecfd4c8711e95f407ea6bfcf8352842 100644
--- a/src/ZEO/mkzeoinst.py
+++ b/src/ZEO/mkzeoinst.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/ZEO/monitor.py b/src/ZEO/monitor.py
index ea118a85d56c74c09f575ae37675b2e8f189bbd9..f8ea3f5320fae39dc98a3e8155529612ddf9c5aa 100644
--- a/src/ZEO/monitor.py
+++ b/src/ZEO/monitor.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/ZEO/runzeo.py b/src/ZEO/runzeo.py
index 0f80f61712b1cf40163badbaeafdec44123931c7..ddfb49e3c28f061538f87504fdb90b041a9ce7a3 100644
--- a/src/ZEO/runzeo.py
+++ b/src/ZEO/runzeo.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/ZEO/scripts/tests.py b/src/ZEO/scripts/tests.py
index cf06fad9e8782318259c5382cbba859e37154858..627d583c8314d2b6c37d3c828823d127c5f2a4e1 100644
--- a/src/ZEO/scripts/tests.py
+++ b/src/ZEO/scripts/tests.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/ZEO/scripts/zeoserverlog.py b/src/ZEO/scripts/zeoserverlog.py
index f56828d878862cbe681c599847494f2196fb82d1..4967bed67cdd92533b5902f38168b34cca352c95 100644
--- a/src/ZEO/scripts/zeoserverlog.py
+++ b/src/ZEO/scripts/zeoserverlog.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZEO/tests/Cache.py b/src/ZEO/tests/Cache.py
index 1be813a4140872a0b953600659f09af50aa79d4c..28966d5f4e701d6fc6c96c84d7fdb1c9892781a5 100644
--- a/src/ZEO/tests/Cache.py
+++ b/src/ZEO/tests/Cache.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/ZEO/tests/CommitLockTests.py b/src/ZEO/tests/CommitLockTests.py
index 0a5f0c3553688b2c23ae4b11fa81d82f3c7c4720..d96c9f0147423025ac18fda4277efe4395c61459 100644
--- a/src/ZEO/tests/CommitLockTests.py
+++ b/src/ZEO/tests/CommitLockTests.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/tests/ConnectionTests.py b/src/ZEO/tests/ConnectionTests.py
index a4cb73c02c1a052768920d3c8d73a03fc1775c95..3a850f681a97d422d39dfdd3c782ebb02c3bc307 100644
--- a/src/ZEO/tests/ConnectionTests.py
+++ b/src/ZEO/tests/ConnectionTests.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/ZEO/tests/InvalidationTests.py b/src/ZEO/tests/InvalidationTests.py
index 9fff65506dc25b0c9b37e7e804598a7c058e50fd..05459eea98f5de605da7457076ff232e867e6087 100644
--- a/src/ZEO/tests/InvalidationTests.py
+++ b/src/ZEO/tests/InvalidationTests.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/ZEO/tests/IterationTests.py b/src/ZEO/tests/IterationTests.py
index 3100a1ea224833a582ffab4c1e945129f2398ff2..fa22ed947e1826846116542f9de3d2ead3765e99 100644
--- a/src/ZEO/tests/IterationTests.py
+++ b/src/ZEO/tests/IterationTests.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Corporation and Contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/tests/TestThread.py b/src/ZEO/tests/TestThread.py
index 9b3aa6f5bc80fd52e8fcae13474d0a37d259a3ac..ec5f715be4719f75c50b39427c6d99e5de997d9c 100644
--- a/src/ZEO/tests/TestThread.py
+++ b/src/ZEO/tests/TestThread.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/tests/ThreadTests.py b/src/ZEO/tests/ThreadTests.py
index 41e8b9190dfea78f22b4a46edb114c68e7f031ba..63896768755b26b2c4f7e8aeb6c8dfaf1532585c 100644
--- a/src/ZEO/tests/ThreadTests.py
+++ b/src/ZEO/tests/ThreadTests.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/tests/__init__.py b/src/ZEO/tests/__init__.py
index 43cf0e3b15475df4bfa487891ff5e581a553b369..be2b45bf84728af01f7b21d6ee7357cc4ef86763 100644
--- a/src/ZEO/tests/__init__.py
+++ b/src/ZEO/tests/__init__.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/ZEO/tests/auth_plaintext.py b/src/ZEO/tests/auth_plaintext.py
index c8f2ea107a0ed14139c7293b80110984616c6bf2..e36989322abb36ba9b78abaf159ca0bd25b0dc59 100644
--- a/src/ZEO/tests/auth_plaintext.py
+++ b/src/ZEO/tests/auth_plaintext.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/ZEO/tests/forker.py b/src/ZEO/tests/forker.py
index ac75f58eb86c9590e8d0321e1036cf1660b3fb38..fffd51c92e9fd1c5ec668cb34bfac39ccfd66ac4 100644
--- a/src/ZEO/tests/forker.py
+++ b/src/ZEO/tests/forker.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/ZEO/tests/speed.py b/src/ZEO/tests/speed.py
index 72be8eb096f62db575c0af5b9cbd14dffb908289..2a01c6ef939f768745b51ced7b6abb868eb8b5d2 100644
--- a/src/ZEO/tests/speed.py
+++ b/src/ZEO/tests/speed.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/ZEO/tests/stress.py b/src/ZEO/tests/stress.py
index e8a580422ea436e3fdbf5c061d3f8faa7ee36c03..c1a262b0f1e9601b0e0d90b2da16c9a4ac6b0b27 100644
--- a/src/ZEO/tests/stress.py
+++ b/src/ZEO/tests/stress.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/ZEO/tests/testAuth.py b/src/ZEO/tests/testAuth.py
index 81ceb196c04423b227ade63ee3f888d4a894daa9..a93ef14281e0c9c4cc14dc20fc0f99613e77caa2 100644
--- a/src/ZEO/tests/testAuth.py
+++ b/src/ZEO/tests/testAuth.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/ZEO/tests/testConnection.py b/src/ZEO/tests/testConnection.py
index 68afd3f0944e028e138e880ab1638659497fff79..e1d2a3a3d3cb1514bf67e6c07b5425a7ca9acc07 100644
--- a/src/ZEO/tests/testConnection.py
+++ b/src/ZEO/tests/testConnection.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/ZEO/tests/testConversionSupport.py b/src/ZEO/tests/testConversionSupport.py
index a54cfc68ab4c2698b6ef1d8e4eb0b2668ad4f88c..233d978b20b751eb6d813ae83e185380d90c740f 100644
--- a/src/ZEO/tests/testConversionSupport.py
+++ b/src/ZEO/tests/testConversionSupport.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/src/ZEO/tests/testMonitor.py b/src/ZEO/tests/testMonitor.py
index eb5b4cc336659c0361dc4c243644596442d2ccda..3dc245879d83c09d983538e19d1f5c866701a9a3 100644
--- a/src/ZEO/tests/testMonitor.py
+++ b/src/ZEO/tests/testMonitor.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/ZEO/tests/testTransactionBuffer.py b/src/ZEO/tests/testTransactionBuffer.py
index 8d846d903e721920e7e7794fd7a515baacaed964..7cd3854ba74c8deca63134cc823053aae8d28f87 100644
--- a/src/ZEO/tests/testTransactionBuffer.py
+++ b/src/ZEO/tests/testTransactionBuffer.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/ZEO/tests/testZEO.py b/src/ZEO/tests/testZEO.py
index 11ff0c12910d4a72b71e67111caf6a939938f882..d80cedb94240346b8496944573523feb25d62a32 100644
--- a/src/ZEO/tests/testZEO.py
+++ b/src/ZEO/tests/testZEO.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/ZEO/tests/testZEOOptions.py b/src/ZEO/tests/testZEOOptions.py
index 454a53f37ace0bae1f02a21e1f15db32287f7c74..c927d29b2937c2abf2d3e33ba26a022f7f0a8b1a 100644
--- a/src/ZEO/tests/testZEOOptions.py
+++ b/src/ZEO/tests/testZEOOptions.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/ZEO/tests/test_cache.py b/src/ZEO/tests/test_cache.py
index e861314ef79981a731a4db18c21d508247b2dc7f..f625f5cb0e32d88f73e56dd1d800f7562e152200 100644
--- a/src/ZEO/tests/test_cache.py
+++ b/src/ZEO/tests/test_cache.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/ZEO/tests/zeoserver.py b/src/ZEO/tests/zeoserver.py
index 136411483b001d6c600580ded19c3e1d40cfdb8a..c6f5ae651e553c58e33101efdfd8b9bd3f3d279e 100644
--- a/src/ZEO/tests/zeoserver.py
+++ b/src/ZEO/tests/zeoserver.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/ZEO/util.py b/src/ZEO/util.py
index 69ffdb2d514aa0616b04c08b72e2915d704c67d8..cf6335f0742d92de178aca0dc1b310c8196ed7fb 100644
--- a/src/ZEO/util.py
+++ b/src/ZEO/util.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/zeoctl.py b/src/ZEO/zeoctl.py
index 106a272070fadc1e7aaddff0db7b845319a360da..ec12c9aa2439e6399ceb39e4ba1de6a5c267fc9f 100644
--- a/src/ZEO/zeoctl.py
+++ b/src/ZEO/zeoctl.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.3
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZEO/zeopasswd.py b/src/ZEO/zeopasswd.py
index b6e4a5fd60d992254aa9180c707be2f8e4aa3b0b..889bce1ad75edbc4dbce30384b195d70919c0b60 100644
--- a/src/ZEO/zeopasswd.py
+++ b/src/ZEO/zeopasswd.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/ZEO/zrpc/__init__.py b/src/ZEO/zrpc/__init__.py
index 279a2de1e72f86c84b1b25bd23ba96b6b8c5f38d..c79471e52786f3f13d9e674cf4c749674e0bd9fa 100644
--- a/src/ZEO/zrpc/__init__.py
+++ b/src/ZEO/zrpc/__init__.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/ZEO/zrpc/client.py b/src/ZEO/zrpc/client.py
index 346f5e5a37c689640850c8e3532b78e3f893f363..9a483a6ae1230cce7efb6b1f4453b5794052a7b1 100644
--- a/src/ZEO/zrpc/client.py
+++ b/src/ZEO/zrpc/client.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/ZEO/zrpc/connection.py b/src/ZEO/zrpc/connection.py
index dc2bd157bd867d90ec04e4eb470d9049580b0758..6c81a9848a72cfcfcfa360e66912602f7a1d03db 100644
--- a/src/ZEO/zrpc/connection.py
+++ b/src/ZEO/zrpc/connection.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/ZEO/zrpc/error.py b/src/ZEO/zrpc/error.py
index 9de3662c21d4eb019664e6c951dfd5c21639ae52..35fda3475a355c25e9eb82a542f536e14fa39105 100644
--- a/src/ZEO/zrpc/error.py
+++ b/src/ZEO/zrpc/error.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/ZEO/zrpc/log.py b/src/ZEO/zrpc/log.py
index a3554efd2ed7191eb48eefaf82cc1350b1e829c9..36ee8e33b75f8d06d07aa3eb3ef08654641eec2c 100644
--- a/src/ZEO/zrpc/log.py
+++ b/src/ZEO/zrpc/log.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/ZEO/zrpc/marshal.py b/src/ZEO/zrpc/marshal.py
index 93a686b9d239af86e12ded49eb409f26c96543f1..9e1669f13a3b184c01f2ccec8ab1b3fea87eae27 100644
--- a/src/ZEO/zrpc/marshal.py
+++ b/src/ZEO/zrpc/marshal.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/ZEO/zrpc/server.py b/src/ZEO/zrpc/server.py
index 25fc22fb03435f9ad03c9370bb7af8c87f1feec8..b0b514ccebe024be11cfd4576b0822a884fbcd80 100644
--- a/src/ZEO/zrpc/server.py
+++ b/src/ZEO/zrpc/server.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/ZEO/zrpc/smac.py b/src/ZEO/zrpc/smac.py
index e44f568f8e682da9a7b72d551a3ef180eb190867..97eff4795e67e78e3927e7ca79c17c4eb46e5b0e 100644
--- a/src/ZEO/zrpc/smac.py
+++ b/src/ZEO/zrpc/smac.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/ZEO/zrpc/trigger.py b/src/ZEO/zrpc/trigger.py
index 7c94a9163a8ce4670b80ce0dc0962add8b89b27b..d2f3beeaa2d6e03d858b993a88b546c572f6e6a6 100644
--- a/src/ZEO/zrpc/trigger.py
+++ b/src/ZEO/zrpc/trigger.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001-2005 Zope Corporation and Contributors.
+# Copyright (c) 2001-2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/ActivityMonitor.py b/src/ZODB/ActivityMonitor.py
index 6b9939299ebee20e47a885b450279b33cdbd0a59..c71e801ad9938bd3c7efffe6cdbe4a86db3a5e43 100644
--- a/src/ZODB/ActivityMonitor.py
+++ b/src/ZODB/ActivityMonitor.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/ZODB/BaseStorage.py b/src/ZODB/BaseStorage.py
index d7f92fe3d4a189dd5a0a227de605d961c14a47ec..14b9dee4c7b999c90c2f1256f8c6fb687cb2efa3 100644
--- a/src/ZODB/BaseStorage.py
+++ b/src/ZODB/BaseStorage.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/ZODB/ConflictResolution.py b/src/ZODB/ConflictResolution.py
index 88d05d79083c676cbde9f1a036da3f970518cbe5..e9924d10aff0a61e1441197e264b252d200b6404 100644
--- a/src/ZODB/ConflictResolution.py
+++ b/src/ZODB/ConflictResolution.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/ZODB/Connection.py b/src/ZODB/Connection.py
index 378f2987739f811806cdccc3a8f5651071d75029..7fa06d70c0444c382ef721fa5e33e14252972cf8 100644
--- a/src/ZODB/Connection.py
+++ b/src/ZODB/Connection.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/ZODB/DB.py b/src/ZODB/DB.py
index 52a07b011f4322988a2fe20746e48194de6b5dfb..d37de4e174c93d66e7fa0189329ebb3ff53117b0 100644
--- a/src/ZODB/DB.py
+++ b/src/ZODB/DB.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/ZODB/ExportImport.py b/src/ZODB/ExportImport.py
index 38654f80b0029f45826a0f817119e507ff01d440..287b69b24adbde4943824fc371dad37fb8a65c25 100644
--- a/src/ZODB/ExportImport.py
+++ b/src/ZODB/ExportImport.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/ZODB/FileStorage/FileStorage.py b/src/ZODB/FileStorage/FileStorage.py
index b3d9f8ec1cfef27be7d8e50e9afbd56da55cee6d..6b07a16ca531ebbb7eaac520334b9909b3d99d8d 100644
--- a/src/ZODB/FileStorage/FileStorage.py
+++ b/src/ZODB/FileStorage/FileStorage.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/ZODB/FileStorage/format.py b/src/ZODB/FileStorage/format.py
index c16628da8e78423f9a070d637d5241f5dc63fc8b..8cc4006451af588d9972c86ce35c34bc71e63925 100644
--- a/src/ZODB/FileStorage/format.py
+++ b/src/ZODB/FileStorage/format.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/ZODB/FileStorage/fsdump.py b/src/ZODB/FileStorage/fsdump.py
index 7de5f4183beda4222316af1155de698d27245f96..9531cded857315e0822334893750ffb9c6ca3e8b 100644
--- a/src/ZODB/FileStorage/fsdump.py
+++ b/src/ZODB/FileStorage/fsdump.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/ZODB/FileStorage/fsoids.py b/src/ZODB/FileStorage/fsoids.py
index 22706cd50fbf4393a6a5a6fbeed4761c9fb68f6e..0f7aba03ce058d9f2eb4b3e7a0006d42ab010759 100644
--- a/src/ZODB/FileStorage/fsoids.py
+++ b/src/ZODB/FileStorage/fsoids.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/ZODB/FileStorage/fspack.py b/src/ZODB/FileStorage/fspack.py
index 84b6abf37dfa73adf861bf5e68f4364bddc01d9b..d9f5b6727dd8d587bd2e6da9f395b714df50e74a 100644
--- a/src/ZODB/FileStorage/fspack.py
+++ b/src/ZODB/FileStorage/fspack.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/ZODB/POSException.py b/src/ZODB/POSException.py
index 1d54205898351cada96815192008d568ee066687..27030e3af84dbf6d61ac5f75268b76e6e4916a90 100644
--- a/src/ZODB/POSException.py
+++ b/src/ZODB/POSException.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/ZODB/UndoLogCompatible.py b/src/ZODB/UndoLogCompatible.py
index 5c1b3e8d61d82bdd1a260c631dd4239197672087..a74641bea6ae48f17f8a757c31b6bf0a10a4306b 100644
--- a/src/ZODB/UndoLogCompatible.py
+++ b/src/ZODB/UndoLogCompatible.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/ZODB/__init__.py b/src/ZODB/__init__.py
index 1b87ea1ed396dbf3b21b0e6b9285d19e359ce95c..da68cbb56cb8bf79f01e299615d11df8f59ea563 100644
--- a/src/ZODB/__init__.py
+++ b/src/ZODB/__init__.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/ZODB/blob.py b/src/ZODB/blob.py
index ec3e9191feeae66c72be915401a49e5c6e83f738..8b12bf2b210d794188fbf7e9fea9783d54d6178d 100644
--- a/src/ZODB/blob.py
+++ b/src/ZODB/blob.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005-2006 Zope Corporation and Contributors.
+# Copyright (c) 2005-2006 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/broken.py b/src/ZODB/broken.py
index dec27280d08dc0c933b70b8731c99bcca59d48f7..68ba759d080f43fb32da303aa227ac768c9c185b 100644
--- a/src/ZODB/broken.py
+++ b/src/ZODB/broken.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/ZODB/config.py b/src/ZODB/config.py
index 1ed98ed7ba44b9e0df255b16b7ec4aa7c1d77829..978a19fd68903da17ad479996c7011e1d9408fc4 100644
--- a/src/ZODB/config.py
+++ b/src/ZODB/config.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/ZODB/conversionhack.py b/src/ZODB/conversionhack.py
index b321f52ffef891f2522662b2a8ea89566310f88a..719f67601e33ba44987b089ad23d8bf34139a0a7 100644
--- a/src/ZODB/conversionhack.py
+++ b/src/ZODB/conversionhack.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/ZODB/dbmStorage.py b/src/ZODB/dbmStorage.py
index 2f133b8a2ce4a26ce57c764f37ca2f0925583807..2d3024a316182adfeb576fb8b421139447e9f304 100644
--- a/src/ZODB/dbmStorage.py
+++ b/src/ZODB/dbmStorage.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/ZODB/fsIndex.py b/src/ZODB/fsIndex.py
index 239537d90c21813f907c8fe0aebba99932e077c6..9594ba04857d4ad92415e841680a8b09d58cc714 100644
--- a/src/ZODB/fsIndex.py
+++ b/src/ZODB/fsIndex.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/ZODB/fsrecover.py b/src/ZODB/fsrecover.py
index eced9a8f5c490ad796ee083db97a150845e874e0..1c438a28c5c34818a20b52cea737149113809765 100644
--- a/src/ZODB/fsrecover.py
+++ b/src/ZODB/fsrecover.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/ZODB/fstools.py b/src/ZODB/fstools.py
index c372a9371700d5e357e0de5939d021b87151a5ca..51fd028eab17e28eace1393e4e0ef1a9c411c798 100644
--- a/src/ZODB/fstools.py
+++ b/src/ZODB/fstools.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/ZODB/loglevels.py b/src/ZODB/loglevels.py
index f6adb7fed8ceb8b183bcd08b5622e4a48477abd1..cb10b23a7b1a0e7ee146845522986b97e91b3965 100644
--- a/src/ZODB/loglevels.py
+++ b/src/ZODB/loglevels.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/ZODB/persistentclass.py b/src/ZODB/persistentclass.py
index c53448ed3d2219e763e754aed9aebaa5b2226aa3..0e1ef2ca3f41c831c0277bdb3418bf2cbebab183 100644
--- a/src/ZODB/persistentclass.py
+++ b/src/ZODB/persistentclass.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/ZODB/scripts/fsoids.py b/src/ZODB/scripts/fsoids.py
index c14d812d6b6aa50b0acad4b301131aa9808b4b0f..c37cd4b009545a910a84a5f6634347c7a9f553b1 100644
--- a/src/ZODB/scripts/fsoids.py
+++ b/src/ZODB/scripts/fsoids.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZODB/scripts/fsrefs.py b/src/ZODB/scripts/fsrefs.py
index c04c2751a3f1b6b88073ee4d66037f93b7fe97dd..43e0558ce6071d0e89c133ddc0d65e299b432cb4 100644
--- a/src/ZODB/scripts/fsrefs.py
+++ b/src/ZODB/scripts/fsrefs.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/scripts/fstail.py b/src/ZODB/scripts/fstail.py
index cfd7a4653417a816e4a9f070c3b1215b67a6eef7..40d97b03cda7403498cc472c7739595363cec8f7 100644
--- a/src/ZODB/scripts/fstail.py
+++ b/src/ZODB/scripts/fstail.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZODB/scripts/fstest.py b/src/ZODB/scripts/fstest.py
index 52a12943cafb747d4c5972d3511b91feef8ab287..e01a7714fd9424a5eee09756c1d59d4d65576dd4 100644
--- a/src/ZODB/scripts/fstest.py
+++ b/src/ZODB/scripts/fstest.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZODB/scripts/migrate.py b/src/ZODB/scripts/migrate.py
index 1e26071f4176d8b90426a54264954cddab7fc380..e4b2c38193b803047abfa48faec2e2427c49d61d 100755
--- a/src/ZODB/scripts/migrate.py
+++ b/src/ZODB/scripts/migrate.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZODB/scripts/migrateblobs.py b/src/ZODB/scripts/migrateblobs.py
index 2c9afb15d7508a7ba58df21e72b82e841b096922..8dab29b5426e4c7e385769d387a8508539017dc5 100644
--- a/src/ZODB/scripts/migrateblobs.py
+++ b/src/ZODB/scripts/migrateblobs.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008 Zope Corporation and Contributors.
+# Copyright (c) 2008 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/scripts/referrers.py b/src/ZODB/scripts/referrers.py
index c6fe96448369a2c8d94f957cce89022f765cd44f..de8fa52e7e55a52f38de5568ca0fe50f36befa61 100644
--- a/src/ZODB/scripts/referrers.py
+++ b/src/ZODB/scripts/referrers.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/scripts/simul.py b/src/ZODB/scripts/simul.py
index b7819b98dffe2ee784cdda8e5c9a24a421090f35..e5b90543bcbe8813f8bd5a53b4152e1ff6743615 100755
--- a/src/ZODB/scripts/simul.py
+++ b/src/ZODB/scripts/simul.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 ##############################################################################
 #
-# Copyright (c) 2001-2005 Zope Corporation and Contributors.
+# Copyright (c) 2001-2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/scripts/stats.py b/src/ZODB/scripts/stats.py
index f7255ae7b061e81990656f5432413b9311509213..745604b01b5cfa048c1d827821c1caa8ba6358f0 100755
--- a/src/ZODB/scripts/stats.py
+++ b/src/ZODB/scripts/stats.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/ZODB/scripts/tests/test_doc.py b/src/ZODB/scripts/tests/test_doc.py
index 89ded92c527d10d9545e01c3d2d5f8a341f48518..81b2d6568b4ffb1e9da413e1d6c0b9c2d16de502 100644
--- a/src/ZODB/scripts/tests/test_doc.py
+++ b/src/ZODB/scripts/tests/test_doc.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/ZODB/scripts/tests/test_repozo.py b/src/ZODB/scripts/tests/test_repozo.py
index 3ec008654b3c8080d65fe1ff8d194c8ebc19b1bb..dc99fde21ae2d67f444fb260ab966ec1a95b9d27 100644
--- a/src/ZODB/scripts/tests/test_repozo.py
+++ b/src/ZODB/scripts/tests/test_repozo.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004-2009 Zope Corporation and Contributors.
+# Copyright (c) 2004-2009 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/scripts/zodbload.py b/src/ZODB/scripts/zodbload.py
index 8e7e1b6f371bb78b75ba4e944012bbae90d77c3f..c20af95eca828bf3bbc82c3b5d1b96f00f9bb48d 100644
--- a/src/ZODB/scripts/zodbload.py
+++ b/src/ZODB/scripts/zodbload.py
@@ -2,7 +2,7 @@
 
 ##############################################################################
 #
-# 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/ZODB/serialize.py b/src/ZODB/serialize.py
index b1ed15a2e6ab50c3c824faea635626092dd60ece..5950cbc1732604b8babdc74c5520ae205753d030 100644
--- a/src/ZODB/serialize.py
+++ b/src/ZODB/serialize.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/ZODB/tests/BasicStorage.py b/src/ZODB/tests/BasicStorage.py
index 716e9ac09e8d1c81f22c87901f8faac43caca317..6f050ec24e129387734a3f0aa991a464c358327c 100644
--- a/src/ZODB/tests/BasicStorage.py
+++ b/src/ZODB/tests/BasicStorage.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/ZODB/tests/ConflictResolution.py b/src/ZODB/tests/ConflictResolution.py
index 7752c582d18769af03fd6cb107b91f3af4b85aaf..660a085ffe8b66e85fbcb2bf69c69e272f1461ee 100644
--- a/src/ZODB/tests/ConflictResolution.py
+++ b/src/ZODB/tests/ConflictResolution.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/ZODB/tests/Corruption.py b/src/ZODB/tests/Corruption.py
index b05886db23850ed569850126fa2b3006023ed948..9d8bbe08e02415f02053ae7adf27460d8202df7e 100644
--- a/src/ZODB/tests/Corruption.py
+++ b/src/ZODB/tests/Corruption.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/ZODB/tests/HistoryStorage.py b/src/ZODB/tests/HistoryStorage.py
index f9adaec668b4d7030a634b0c8cdd332eb1694383..6a842b32e04248b8d8a01f779cfabfa47a9b55c5 100644
--- a/src/ZODB/tests/HistoryStorage.py
+++ b/src/ZODB/tests/HistoryStorage.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/ZODB/tests/IteratorStorage.py b/src/ZODB/tests/IteratorStorage.py
index 17dedad6e0829a383d3fc33c9d0d532e0972ec73..b5f5689746837a61c551787c58f4ad996466f7e3 100644
--- a/src/ZODB/tests/IteratorStorage.py
+++ b/src/ZODB/tests/IteratorStorage.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/ZODB/tests/MinPO.py b/src/ZODB/tests/MinPO.py
index b71bdbfccfe8290bac0a4bd45241133b3313066e..9795f7ff68cd7697a7d110fabab71b50bd14cc48 100644
--- a/src/ZODB/tests/MinPO.py
+++ b/src/ZODB/tests/MinPO.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/ZODB/tests/PackableStorage.py b/src/ZODB/tests/PackableStorage.py
index 2b4cdb5b4e621ac9a16c282c894156e4fb096a20..e8a90fed36f5e54ef606722af6a3947a0d980245 100644
--- a/src/ZODB/tests/PackableStorage.py
+++ b/src/ZODB/tests/PackableStorage.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/ZODB/tests/PersistentStorage.py b/src/ZODB/tests/PersistentStorage.py
index 749a1e91dfc58abdde6abfeb948e9236807c59c5..42d4339d0cfe52bb1c072b2a24e75fb3e79fb178 100644
--- a/src/ZODB/tests/PersistentStorage.py
+++ b/src/ZODB/tests/PersistentStorage.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/ZODB/tests/ReadOnlyStorage.py b/src/ZODB/tests/ReadOnlyStorage.py
index 6dab8c8e1c6dc65fc9e29aa609ae47eabace1a90..d2289e68485a7a68278e0c84cf115ecc81a12f98 100644
--- a/src/ZODB/tests/ReadOnlyStorage.py
+++ b/src/ZODB/tests/ReadOnlyStorage.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/ZODB/tests/RecoveryStorage.py b/src/ZODB/tests/RecoveryStorage.py
index c896c81f226a5c583dd00c6e3cfd92a7e4cc1b53..129e0a19d39df623bd80684c17ecc3ce0ac85eb8 100644
--- a/src/ZODB/tests/RecoveryStorage.py
+++ b/src/ZODB/tests/RecoveryStorage.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/ZODB/tests/RevisionStorage.py b/src/ZODB/tests/RevisionStorage.py
index 14f129b80849064c5803e77c161b54e5a748a810..6c00727b9ac272a316160cbe3845d24eee1f58a7 100644
--- a/src/ZODB/tests/RevisionStorage.py
+++ b/src/ZODB/tests/RevisionStorage.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/ZODB/tests/StorageTestBase.py b/src/ZODB/tests/StorageTestBase.py
index 221e7d3c5339496f9d895b8b771a0c62fc905038..7e7d10e0b74cc35dcf0dcdcf89934e2faa793f51 100644
--- a/src/ZODB/tests/StorageTestBase.py
+++ b/src/ZODB/tests/StorageTestBase.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/ZODB/tests/Synchronization.py b/src/ZODB/tests/Synchronization.py
index 5c2edcc33fddbea1d0f534b3172c523cbb6b05e2..7310ba825eaae87cbfd7487e220219b32c804c5e 100644
--- a/src/ZODB/tests/Synchronization.py
+++ b/src/ZODB/tests/Synchronization.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/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py
index e000ad978a1fe67c7c3052561535b10fdb3a1f6e..400e46739c88da168d56996160db449e58b18c64 100644
--- a/src/ZODB/tests/TransactionalUndoStorage.py
+++ b/src/ZODB/tests/TransactionalUndoStorage.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/ZODB/tests/blob_basic.txt b/src/ZODB/tests/blob_basic.txt
index 4aaa0d3afb3cb3507155e64dcc6340f1f239d045..0633a4fc4c369c508b3aec74e6da59a59531e468 100644
--- a/src/ZODB/tests/blob_basic.txt
+++ b/src/ZODB/tests/blob_basic.txt
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/blob_importexport.txt b/src/ZODB/tests/blob_importexport.txt
index 4eb89716936296dc512cd55465f153a680bcf1fc..ee3fc0f21a1a75c8478b80911091403a9d654df9 100644
--- a/src/ZODB/tests/blob_importexport.txt
+++ b/src/ZODB/tests/blob_importexport.txt
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/blob_transaction.txt b/src/ZODB/tests/blob_transaction.txt
index 77131f4e3cbd560a4ac2fe0b83a3bcdef467ffe0..3ccb9f5be41ccaedf85cfb04d0e52718376e98b9 100644
--- a/src/ZODB/tests/blob_transaction.txt
+++ b/src/ZODB/tests/blob_transaction.txt
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005-2007 Zope Corporation and Contributors.
+# Copyright (c) 2005-2007 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/blobstorage_packing.txt b/src/ZODB/tests/blobstorage_packing.txt
index 74673712b4e78bced9f930defb06b3cd37dcc35e..880f34d9ce6305586d3f5a526032e9fa96454b9b 100644
--- a/src/ZODB/tests/blobstorage_packing.txt
+++ b/src/ZODB/tests/blobstorage_packing.txt
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/dangle.py b/src/ZODB/tests/dangle.py
index 252a370328902e99bad623247ea85d1c931a25d6..12cfee53689bf53f90331fdc7bad98083d6ae675 100755
--- a/src/ZODB/tests/dangle.py
+++ b/src/ZODB/tests/dangle.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors.
+# Copyright (c) 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/loggingsupport.py b/src/ZODB/tests/loggingsupport.py
index 9431f46f61eaf7eff9498e2f11c89bab324cc9b6..b840f02af6f63e7969ec7ead11558a8ef36d62f2 100644
--- a/src/ZODB/tests/loggingsupport.py
+++ b/src/ZODB/tests/loggingsupport.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/ZODB/tests/sampledm.py b/src/ZODB/tests/sampledm.py
index b017145739069b56913b8dbb399bc5a0ab23844f..a68d6ea685cdb55332ec7a87fdfa06d6207d08c6 100644
--- a/src/ZODB/tests/sampledm.py
+++ b/src/ZODB/tests/sampledm.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/ZODB/tests/speed.py b/src/ZODB/tests/speed.py
index 14ce828dd889f85b8b057b60043405b519ed1e3f..1649f33d37c0665afc596bdde023fcd76eb75139 100644
--- a/src/ZODB/tests/speed.py
+++ b/src/ZODB/tests/speed.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/ZODB/tests/testActivityMonitor.py b/src/ZODB/tests/testActivityMonitor.py
index 671565d3a498b94f2b9009fc25854d1c21870af7..e40fdcaa3160e3f4e54e1d52f3a1bfd8109e37ee 100644
--- a/src/ZODB/tests/testActivityMonitor.py
+++ b/src/ZODB/tests/testActivityMonitor.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/ZODB/tests/testBroken.py b/src/ZODB/tests/testBroken.py
index 82f86166f541b05cf1d56b902f6e17b351d62395..d5464011603a0609a32bbb5189b9fff3587a6ef5 100644
--- a/src/ZODB/tests/testBroken.py
+++ b/src/ZODB/tests/testBroken.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/ZODB/tests/testCache.py b/src/ZODB/tests/testCache.py
index d798983c07efd3baa07d4a909284f782ec0efcba..5891782c9bcdd0bf8ab95176e7c24f069b0f7cbd 100644
--- a/src/ZODB/tests/testCache.py
+++ b/src/ZODB/tests/testCache.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/ZODB/tests/testConfig.py b/src/ZODB/tests/testConfig.py
index e9b04b91a040d60cb30db3bc5a3802b9563cd615..3c0094a6ea7c782591cc413592d039d8292e432f 100644
--- a/src/ZODB/tests/testConfig.py
+++ b/src/ZODB/tests/testConfig.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/ZODB/tests/testConnection.py b/src/ZODB/tests/testConnection.py
index e95c25e0df453acbb7d7b0bba4628c22b6d9a0fd..07e7900f68d7c8a8480d325ba7b50774e1430735 100644
--- a/src/ZODB/tests/testConnection.py
+++ b/src/ZODB/tests/testConnection.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/ZODB/tests/testConnectionSavepoint.py b/src/ZODB/tests/testConnectionSavepoint.py
index 8b6d11695aaedd9330c83f7b3573846fadd46969..b9385e3be80b44a3660dd55dcc813c8f691e25db 100644
--- a/src/ZODB/tests/testConnectionSavepoint.py
+++ b/src/ZODB/tests/testConnectionSavepoint.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/ZODB/tests/testDB.py b/src/ZODB/tests/testDB.py
index 2ca3bd3655c25ccb45bf01f2cc1b3c776050298b..a87b4208f0ebbe0e52f33c70a57a9d898e0716c7 100644
--- a/src/ZODB/tests/testDB.py
+++ b/src/ZODB/tests/testDB.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/ZODB/tests/testDemoStorage.py b/src/ZODB/tests/testDemoStorage.py
index a2f8b4998c6b1190b5490ad81f0bf9201b800e89..9fdfb8b6ff3910873f7b5494d0e8b1d46a0c4b48 100644
--- a/src/ZODB/tests/testDemoStorage.py
+++ b/src/ZODB/tests/testDemoStorage.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/ZODB/tests/testFileStorage.py b/src/ZODB/tests/testFileStorage.py
index 54382f5d969ae338c51fdf8fe83fbb088332a20c..95415e26915490657f3271d57ca67755e927f6f2 100644
--- a/src/ZODB/tests/testFileStorage.py
+++ b/src/ZODB/tests/testFileStorage.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/ZODB/tests/testMappingStorage.py b/src/ZODB/tests/testMappingStorage.py
index 6be22df8c7cee59df34c362568e109c397992a18..b94d060786c21833c2d16caa5cb42fdd46716854 100644
--- a/src/ZODB/tests/testMappingStorage.py
+++ b/src/ZODB/tests/testMappingStorage.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/ZODB/tests/testPersistentList.py b/src/ZODB/tests/testPersistentList.py
index 233a0070b48cd20b661f00aca0554e07e1b67502..533940ce23fb8de5b5607250c1bfd7808d454a1c 100644
--- a/src/ZODB/tests/testPersistentList.py
+++ b/src/ZODB/tests/testPersistentList.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/ZODB/tests/testPersistentMapping.py b/src/ZODB/tests/testPersistentMapping.py
index 6ce445b6ffab8a2291e6fc6599172cc190d345ad..eb8346bb2866d1a51a7fd2ff5b3774bd02360f07 100644
--- a/src/ZODB/tests/testPersistentMapping.py
+++ b/src/ZODB/tests/testPersistentMapping.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/ZODB/tests/testRecover.py b/src/ZODB/tests/testRecover.py
index 405e392ec75f2558d15e81a7c3494fc65c8ea93b..a0fe2393e402676182780f34cbe0d5196db60c26 100644
--- a/src/ZODB/tests/testRecover.py
+++ b/src/ZODB/tests/testRecover.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/ZODB/tests/testSerialize.py b/src/ZODB/tests/testSerialize.py
index c9f12b868f9df504a9efd53ba23585685cafad89..1998dd5664b3dd10933036f44341615300977b65 100644
--- a/src/ZODB/tests/testSerialize.py
+++ b/src/ZODB/tests/testSerialize.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/ZODB/tests/testTimeStamp.py b/src/ZODB/tests/testTimeStamp.py
index 3bd6ecf04671dc452d192aef73d446812ba83702..1770109a84a3a602230332b367d48ef01f0b2f9f 100644
--- a/src/ZODB/tests/testTimeStamp.py
+++ b/src/ZODB/tests/testTimeStamp.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/ZODB/tests/testUtils.py b/src/ZODB/tests/testUtils.py
index 45c9041f53334f010438bc808bab02c7a64ac1c3..1f445ab5c20e6e880758646bd75d21f00672f215 100644
--- a/src/ZODB/tests/testUtils.py
+++ b/src/ZODB/tests/testUtils.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/ZODB/tests/testZODB.py b/src/ZODB/tests/testZODB.py
index c376e9b8ca3902b2424e48848e058d8c015f8229..736ba777a25a0d1e6a0879d95cc315bc53be41a9 100644
--- a/src/ZODB/tests/testZODB.py
+++ b/src/ZODB/tests/testZODB.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/ZODB/tests/test_cache.py b/src/ZODB/tests/test_cache.py
index 47e8634dccb163448223854d627b0800a00376db..c7a0e3d1de88138bc5b792c30a9876dbe0a818e6 100644
--- a/src/ZODB/tests/test_cache.py
+++ b/src/ZODB/tests/test_cache.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/ZODB/tests/test_datamanageradapter.py b/src/ZODB/tests/test_datamanageradapter.py
index ae789e3cf8b36d2c734b5641b3cf6a8d5b5233eb..1f347f0603a68bc6e59aa8dd1f5b491362da4e21 100644
--- a/src/ZODB/tests/test_datamanageradapter.py
+++ b/src/ZODB/tests/test_datamanageradapter.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/ZODB/tests/test_doctest_files.py b/src/ZODB/tests/test_doctest_files.py
index 3a7d5d40981ed047a54445c03c7b0dce92d31352..5d46d03e1ace3f96be6ba8e78b2934b84ccc6ec0 100644
--- a/src/ZODB/tests/test_doctest_files.py
+++ b/src/ZODB/tests/test_doctest_files.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/ZODB/tests/test_fsdump.py b/src/ZODB/tests/test_fsdump.py
index 464921b07a76e1ec3ac3f34982768d56454a6f48..508ce33677b0b1c268563b3c1fafe279e215418a 100644
--- a/src/ZODB/tests/test_fsdump.py
+++ b/src/ZODB/tests/test_fsdump.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/test_storage.py b/src/ZODB/tests/test_storage.py
index a13434bfbdb523ce37d0cf1c0b5b9eb414a89bfd..92a0a157cc81fcc587600aa9f7394c9bf4d468b1 100644
--- a/src/ZODB/tests/test_storage.py
+++ b/src/ZODB/tests/test_storage.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/ZODB/tests/testblob.py b/src/ZODB/tests/testblob.py
index f5741720959c59fb94e3457887790791be61dbc1..9762f70d1205b479ce6fd6132c262bf352d70355 100644
--- a/src/ZODB/tests/testblob.py
+++ b/src/ZODB/tests/testblob.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/ZODB/tests/testconflictresolution.py b/src/ZODB/tests/testconflictresolution.py
index c2bb08dacc494d50236d2af42a02686b4d0ab6f9..00f6222fcb7ab743915b9fcaf88e6db33f036dd0 100644
--- a/src/ZODB/tests/testconflictresolution.py
+++ b/src/ZODB/tests/testconflictresolution.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007 Zope Corporation and Contributors.
+# Copyright (c) 2007 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/testcrossdatabasereferences.py b/src/ZODB/tests/testcrossdatabasereferences.py
index 98040379603dd193fdd39a3d2cf85c377f5e60c7..6ef741d473276ed8701bff550ab7289217bc0be3 100644
--- a/src/ZODB/tests/testcrossdatabasereferences.py
+++ b/src/ZODB/tests/testcrossdatabasereferences.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/testfsIndex.py b/src/ZODB/tests/testfsIndex.py
index fb04b423d75862ed4f6428e1ba2b62e0bb32131b..4dc96ee41784e8df1ca9205989054d4a5151f612 100644
--- a/src/ZODB/tests/testfsIndex.py
+++ b/src/ZODB/tests/testfsIndex.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/ZODB/tests/testfsoids.py b/src/ZODB/tests/testfsoids.py
index 5389f1af7a564115ceff18ee50d2b591e20f7966..e8c5f21c15ad0c9bbaddd9d3659bc2d0a634bace 100644
--- a/src/ZODB/tests/testfsoids.py
+++ b/src/ZODB/tests/testfsoids.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/ZODB/tests/testhistoricalconnections.py b/src/ZODB/tests/testhistoricalconnections.py
index 5e26bed3fd3d455708bf4937a5cd62f0da56cd99..61f7d378b5dd6d0224174feef3a988da34dca5e7 100644
--- a/src/ZODB/tests/testhistoricalconnections.py
+++ b/src/ZODB/tests/testhistoricalconnections.py
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007 Zope Corporation and Contributors.
+# Copyright (c) 2007 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
diff --git a/src/ZODB/tests/testmvcc.py b/src/ZODB/tests/testmvcc.py
index 72344c2555285264c086a12ff2bff39572493099..2c87dac01de0a70b4aee32762b374cc325653597 100644
--- a/src/ZODB/tests/testmvcc.py
+++ b/src/ZODB/tests/testmvcc.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/ZODB/tests/testpersistentclass.py b/src/ZODB/tests/testpersistentclass.py
index c1ec3fe0ab07f40633dc06d13b8364af6ee05666..205c0c396b63e7b5540ab4ae88e3375ff8d6356a 100644
--- a/src/ZODB/tests/testpersistentclass.py
+++ b/src/ZODB/tests/testpersistentclass.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/ZODB/tests/util.py b/src/ZODB/tests/util.py
index 5b95dc5e36b2c92b66ae5bfbb81d25df920d5654..4375d94a1ee7a5e8256e3e2ea49de60c59879c29 100644
--- a/src/ZODB/tests/util.py
+++ b/src/ZODB/tests/util.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/ZODB/tests/warnhook.py b/src/ZODB/tests/warnhook.py
index 87f32fd261f84d328066339f8c4bbb088a2920c4..d94c04748c54b43fe6a952f659e874ec9090a811 100644
--- a/src/ZODB/tests/warnhook.py
+++ b/src/ZODB/tests/warnhook.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/ZODB/transact.py b/src/ZODB/transact.py
index 712d250f10133c95b717155e67bf99916367668d..0125bdb3a04b599d25d82c4b528e4c94aeb2bf95 100644
--- a/src/ZODB/transact.py
+++ b/src/ZODB/transact.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/ZODB/utils.py b/src/ZODB/utils.py
index 57feae3123cc45803b6c4c08a39b1e508b9dec94..34d33e0065d9d3d7a5f35e39821d1bd73c5633fc 100644
--- a/src/ZODB/utils.py
+++ b/src/ZODB/utils.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/persistent/TimeStamp.c b/src/persistent/TimeStamp.c
index 65345496017672a25cee8847938bfe3d21c20919..965d60c9d40061b5d8d8d02d54f7a6e0fc8e5108 100644
--- a/src/persistent/TimeStamp.c
+++ b/src/persistent/TimeStamp.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-  Copyright (c) 2001, 2004 Zope Corporation and Contributors.
+  Copyright (c) 2001, 2004 Zope Foundation and Contributors.
   All Rights Reserved.
 
   This software is subject to the provisions of the Zope Public License,
diff --git a/src/persistent/__init__.py b/src/persistent/__init__.py
index 88d7dd61594029c669d7d367fedd4f4741cd6d3e..07cf4d61f71165e22beee120618473d372d6789f 100644
--- a/src/persistent/__init__.py
+++ b/src/persistent/__init__.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/persistent/cPersistence.c b/src/persistent/cPersistence.c
index 23f9852d8bb13a1682eaf62976ebd00c9ab4a44a..1bfcbd0dce16e8291286cea4b9f46c3875016191 100644
--- a/src/persistent/cPersistence.c
+++ b/src/persistent/cPersistence.c
@@ -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/persistent/cPersistence.h b/src/persistent/cPersistence.h
index 9a7808dee60f71ce50389c6706f7c4b591b6594b..a353eda3aefbefe681680ce3fb27fd4f78bb83c9 100644
--- a/src/persistent/cPersistence.h
+++ b/src/persistent/cPersistence.h
@@ -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/persistent/cPickleCache.c b/src/persistent/cPickleCache.c
index 7bee6c911b2a07a7e9416a945257772c41cde7cf..95841a4fa31a8bfb32f1d1b422a155bf7fa35ecc 100644
--- a/src/persistent/cPickleCache.c
+++ b/src/persistent/cPickleCache.c
@@ -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/persistent/interfaces.py b/src/persistent/interfaces.py
index ce4672756512e3062f28a1079af93b1c046f0a58..6b3e462189066731da89b349c47a9f240492afb4 100644
--- a/src/persistent/interfaces.py
+++ b/src/persistent/interfaces.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/persistent/list.py b/src/persistent/list.py
index cfbbafdc14fa53f5003f8aff722c2d494aa3e05b..41dbd0829f4d77a81b0aa298b342376c112c9c06 100644
--- a/src/persistent/list.py
+++ b/src/persistent/list.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/persistent/mapping.py b/src/persistent/mapping.py
index d6ee39774fc8a2b8fccc498370fd0239a4c01bf7..6537a08969fe8a5a0e939f69dd3b2700027d86e2 100644
--- a/src/persistent/mapping.py
+++ b/src/persistent/mapping.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/persistent/ring.c b/src/persistent/ring.c
index ebc8a67b456f44719419ce616d11512235d2b3e4..a5151ed356ca5a2c0b341676cb0b545a8124d0b6 100644
--- a/src/persistent/ring.c
+++ b/src/persistent/ring.c
@@ -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/persistent/ring.h b/src/persistent/ring.h
index 18f56e7745fa7c51dc87bb6bc9bdfa426201f051..df8e822df2f323a8abd36a0d0550f4afbb78753a 100644
--- a/src/persistent/ring.h
+++ b/src/persistent/ring.h
@@ -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/persistent/tests/testPersistent.py b/src/persistent/tests/testPersistent.py
index 6afe73e0ee27b90bd07ff7f0a11284c2eefc5fc8..51e038231587d3ca60186477c9c6e60d1684a64c 100644
--- a/src/persistent/tests/testPersistent.py
+++ b/src/persistent/tests/testPersistent.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/persistent/tests/test_PickleCache.py b/src/persistent/tests/test_PickleCache.py
index e2be2f345f9a4e711b352249f837dfd3479f01a5..ffb465a3650b8dbf52d9ab4eaadb9dacda26938e 100644
--- a/src/persistent/tests/test_PickleCache.py
+++ b/src/persistent/tests/test_PickleCache.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/persistent/tests/test_list.py b/src/persistent/tests/test_list.py
index cae546175e62a38f7743d06e6fe03be9b4fd5a32..30d42660190f63a5d82d2998d9f5818cd3d86afc 100644
--- a/src/persistent/tests/test_list.py
+++ b/src/persistent/tests/test_list.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/persistent/tests/test_overriding_attrs.py b/src/persistent/tests/test_overriding_attrs.py
index a6974a2b290bb3d1b1b26847446dbb74df37a24e..407118b9428005527fe177bd549170940c55cb46 100644
--- a/src/persistent/tests/test_overriding_attrs.py
+++ b/src/persistent/tests/test_overriding_attrs.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/persistent/tests/test_pickle.py b/src/persistent/tests/test_pickle.py
index f6699d211dc05b84fb2dbb664358ee7fa686a00b..b747554162f7bb3b35291a153105996f22d81bfe 100644
--- a/src/persistent/tests/test_pickle.py
+++ b/src/persistent/tests/test_pickle.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/persistent/tests/test_wref.py b/src/persistent/tests/test_wref.py
index 3c60bf0575c59095904cba98477898b80fd12ff4..9f4c1f2b5006447a390e5b79f6c0e30d598bc8dc 100644
--- a/src/persistent/tests/test_wref.py
+++ b/src/persistent/tests/test_wref.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/persistent/wref.py b/src/persistent/wref.py
index 3291bf0c3abde5bc3c86cf9b66058b6527c525f0..1093f5f9de86f79ba898088677acec90b040023d 100644
--- a/src/persistent/wref.py
+++ b/src/persistent/wref.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,