diff --git a/COPYRIGHT b/COPYRIGHT
index 2e0f109e1c..9772b23dfe 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,4 @@
-Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-Copyright (C) Internet Software Consortium.
+Copyright (C) 1996-2018  Internet Systems Consortium, Inc. ("ISC")
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/Makefile.in b/Makefile.in
index e15487efe2..ae42333429 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/acconfig.h b/acconfig.h
index 851c4ff091..07d58e6cdd 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/Makefile.in b/bin/Makefile.in
index de1c1f4fa4..65ddd5da3e 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 1f0520e0d8..5765c4a62f 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 8bd5f595f8..55ec97c94b 100644
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/check-tool.h b/bin/check/check-tool.h
index 416e4dd07f..6614fa3806 100644
--- a/bin/check/check-tool.h
+++ b/bin/check/check-tool.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c
index a932af685c..9e6af2298a 100644
--- a/bin/check/named-checkconf.c
+++ b/bin/check/named-checkconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/named-checkconf.docbook b/bin/check/named-checkconf.docbook
index 45d61263d5..245edb13b3 100644
--- a/bin/check/named-checkconf.docbook
+++ b/bin/check/named-checkconf.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -45,12 +47,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/bin/check/named-checkzone.c b/bin/check/named-checkzone.c
index 0574c41cd2..df26dacea4 100644
--- a/bin/check/named-checkzone.c
+++ b/bin/check/named-checkzone.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/check/named-checkzone.docbook b/bin/check/named-checkzone.docbook
index 2238d4bd24..43a7972d80 100644
--- a/bin/check/named-checkzone.docbook
+++ b/bin/check/named-checkzone.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -47,12 +49,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/bin/confgen/rndc-confgen.c b/bin/confgen/rndc-confgen.c
index 30e70d83e9..8b33e5e1b5 100644
--- a/bin/confgen/rndc-confgen.c
+++ b/bin/confgen/rndc-confgen.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/confgen/rndc-confgen.docbook b/bin/confgen/rndc-confgen.docbook
index ef175d871d..d0c43a3cec 100644
--- a/bin/confgen/rndc-confgen.docbook
+++ b/bin/confgen/rndc-confgen.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,8 @@
 
   <docinfo>
     <copyright>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -48,11 +49,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 596403c71e..c265bce880 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index fbbad7ff98..a3b99dc8cf 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 808988564b..f1d7c77cc2 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -54,13 +57,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 4de6d83763..a61aeb583b 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 5848ca1b71..b182fba6a3 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook
index 5b45c0d197..9e7db9a1f6 100644
--- a/bin/dig/host.docbook
+++ b/bin/dig/host.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -40,6 +39,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -52,12 +54,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index d351f07e12..582b705f0e 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index 47b899495a..a442dbf1d5 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index bf4830dc15..68cc2190c2 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index ba7334ffe7..1727e2bae8 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dnssec/dnssec-keygen.docbook b/bin/dnssec/dnssec-keygen.docbook
index c2859cbda4..ec251f30c8 100644
--- a/bin/dnssec/dnssec-keygen.docbook
+++ b/bin/dnssec/dnssec-keygen.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -53,13 +56,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index f116ae2a91..f68e4efabd 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook
index 5b344a964e..7e4b4b424d 100644
--- a/bin/dnssec/dnssec-signzone.docbook
+++ b/bin/dnssec/dnssec-signzone.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -53,13 +56,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 3a13a7b72b..47f00b5362 100644
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/dnssec/dnssectool.h b/bin/dnssec/dnssectool.h
index 6dbbbaeeff..896cc96122 100644
--- a/bin/dnssec/dnssectool.h
+++ b/bin/dnssec/dnssectool.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 02ec994813..ab6d9c062e 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index af832049fb..2d48c90561 100644
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/client.c b/bin/named/client.c
index d3ff95e6bb..56e03bc661 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/config.c b/bin/named/config.c
index beee6631ab..f74dd486d9 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/control.c b/bin/named/control.c
index 6685f66f3d..5dc37959bb 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index 799487dee0..3449c2c60b 100644
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/builtin.h b/bin/named/include/named/builtin.h
index 025dfa6efe..1aa6686a77 100644
--- a/bin/named/include/named/builtin.h
+++ b/bin/named/include/named/builtin.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 8b83d1988d..ddcaeed0ea 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/config.h b/bin/named/include/named/config.h
index e9d70e08f9..97797c7bc5 100644
--- a/bin/named/include/named/config.h
+++ b/bin/named/include/named/config.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index c1daaa6c67..8fe2eab333 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 801139b1f4..c29dcf874e 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 0216910ea0..a6d9b0fd99 100644
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/listenlist.h b/bin/named/include/named/listenlist.h
index 97adece61a..947f2a0cce 100644
--- a/bin/named/include/named/listenlist.h
+++ b/bin/named/include/named/listenlist.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/log.h b/bin/named/include/named/log.h
index 4be344c00c..6bb7e9dfae 100644
--- a/bin/named/include/named/log.h
+++ b/bin/named/include/named/log.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/logconf.h b/bin/named/include/named/logconf.h
index 3d27d8beea..57b3bbf4e3 100644
--- a/bin/named/include/named/logconf.h
+++ b/bin/named/include/named/logconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/lwaddr.h b/bin/named/include/named/lwaddr.h
index c4a039a02a..68f0ea1f16 100644
--- a/bin/named/include/named/lwaddr.h
+++ b/bin/named/include/named/lwaddr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/lwdclient.h b/bin/named/include/named/lwdclient.h
index 6b6baaf60d..58d7977750 100644
--- a/bin/named/include/named/lwdclient.h
+++ b/bin/named/include/named/lwdclient.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/lwresd.h b/bin/named/include/named/lwresd.h
index 74f6ff2f8f..739a62f08d 100644
--- a/bin/named/include/named/lwresd.h
+++ b/bin/named/include/named/lwresd.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/lwsearch.h b/bin/named/include/named/lwsearch.h
index 0a2067d1ef..84e805acc2 100644
--- a/bin/named/include/named/lwsearch.h
+++ b/bin/named/include/named/lwsearch.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/main.h b/bin/named/include/named/main.h
index 2dc9bb46b0..a84aed461a 100644
--- a/bin/named/include/named/main.h
+++ b/bin/named/include/named/main.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/notify.h b/bin/named/include/named/notify.h
index aaf0c9b55b..b38bb142af 100644
--- a/bin/named/include/named/notify.h
+++ b/bin/named/include/named/notify.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/query.h b/bin/named/include/named/query.h
index 8dff29a33c..6e64ceab8d 100644
--- a/bin/named/include/named/query.h
+++ b/bin/named/include/named/query.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/server.h b/bin/named/include/named/server.h
index 75da38eae2..7c346e5692 100644
--- a/bin/named/include/named/server.h
+++ b/bin/named/include/named/server.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/sortlist.h b/bin/named/include/named/sortlist.h
index 6366f4d532..5b6ef0b289 100644
--- a/bin/named/include/named/sortlist.h
+++ b/bin/named/include/named/sortlist.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/tkeyconf.h b/bin/named/include/named/tkeyconf.h
index 4c449ea3ce..0d794a6357 100644
--- a/bin/named/include/named/tkeyconf.h
+++ b/bin/named/include/named/tkeyconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/tsigconf.h b/bin/named/include/named/tsigconf.h
index 80920d8b7c..1c5698e16d 100644
--- a/bin/named/include/named/tsigconf.h
+++ b/bin/named/include/named/tsigconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/types.h b/bin/named/include/named/types.h
index 5ec344dd21..67c3e5cb37 100644
--- a/bin/named/include/named/types.h
+++ b/bin/named/include/named/types.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/update.h b/bin/named/include/named/update.h
index 37478a40eb..ada6d53c67 100644
--- a/bin/named/include/named/update.h
+++ b/bin/named/include/named/update.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/xfrout.h b/bin/named/include/named/xfrout.h
index c0402d2bc0..f56386da4d 100644
--- a/bin/named/include/named/xfrout.h
+++ b/bin/named/include/named/xfrout.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/include/named/zoneconf.h b/bin/named/include/named/zoneconf.h
index b44140f802..ac065f6aca 100644
--- a/bin/named/include/named/zoneconf.h
+++ b/bin/named/include/named/zoneconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index dd3980e46c..41d114749b 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/listenlist.c b/bin/named/listenlist.c
index 5a94b8ca79..9e1da8d1fd 100644
--- a/bin/named/listenlist.c
+++ b/bin/named/listenlist.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/log.c b/bin/named/log.c
index 6c081bd7d5..4644fc8bec 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 80957423ea..f279cf7fe3 100644
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwaddr.c b/bin/named/lwaddr.c
index fcb4a60f0c..23d89a52eb 100644
--- a/bin/named/lwaddr.c
+++ b/bin/named/lwaddr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwdclient.c b/bin/named/lwdclient.c
index f397405f0a..3a21230b0f 100644
--- a/bin/named/lwdclient.c
+++ b/bin/named/lwdclient.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwderror.c b/bin/named/lwderror.c
index 032511fe33..665b240d52 100644
--- a/bin/named/lwderror.c
+++ b/bin/named/lwderror.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwdgabn.c b/bin/named/lwdgabn.c
index 92dc2733d5..7436e06f2e 100644
--- a/bin/named/lwdgabn.c
+++ b/bin/named/lwdgabn.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwdgnba.c b/bin/named/lwdgnba.c
index 97866e7aa8..c1e5929510 100644
--- a/bin/named/lwdgnba.c
+++ b/bin/named/lwdgnba.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c
index 9ebbd87872..86d4e56f17 100644
--- a/bin/named/lwdgrbn.c
+++ b/bin/named/lwdgrbn.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwdnoop.c b/bin/named/lwdnoop.c
index e320c716af..f913f50b9d 100644
--- a/bin/named/lwdnoop.c
+++ b/bin/named/lwdnoop.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwresd.c b/bin/named/lwresd.c
index 0c43161f21..bfe355fc77 100644
--- a/bin/named/lwresd.c
+++ b/bin/named/lwresd.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/lwresd.docbook b/bin/named/lwresd.docbook
index e7db1ac61f..82a04f6da9 100644
--- a/bin/named/lwresd.docbook
+++ b/bin/named/lwresd.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -50,11 +51,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/named/lwsearch.c b/bin/named/lwsearch.c
index 73204c134f..a91a4f2b0d 100644
--- a/bin/named/lwsearch.c
+++ b/bin/named/lwsearch.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/main.c b/bin/named/main.c
index dfc10fbff5..fa1753e32d 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/named.docbook b/bin/named/named.docbook
index 38a88f9416..aaf0a826eb 100644
--- a/bin/named/named.docbook
+++ b/bin/named/named.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -53,12 +55,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/named/notify.c b/bin/named/notify.c
index 1245c493df..b88b1fff4c 100644
--- a/bin/named/notify.c
+++ b/bin/named/notify.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/query.c b/bin/named/query.c
index 708d565643..c606a7650c 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/server.c b/bin/named/server.c
index 1af48cf4d6..36c92ab59c 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/sortlist.c b/bin/named/sortlist.c
index acd434249f..2c91e23ae5 100644
--- a/bin/named/sortlist.c
+++ b/bin/named/sortlist.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/tkeyconf.c b/bin/named/tkeyconf.c
index fb507e8120..1815085c89 100644
--- a/bin/named/tkeyconf.c
+++ b/bin/named/tkeyconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/tsigconf.c b/bin/named/tsigconf.c
index fb9d7f60e3..d96404f2c8 100644
--- a/bin/named/tsigconf.c
+++ b/bin/named/tsigconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/unix/Makefile.in b/bin/named/unix/Makefile.in
index 1282ef14c1..6aed790150 100644
--- a/bin/named/unix/Makefile.in
+++ b/bin/named/unix/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h
index 34c1620d9a..2f67a3ff00 100644
--- a/bin/named/unix/include/named/os.h
+++ b/bin/named/unix/include/named/os.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 2c9229ee44..951e3c4292 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/update.c b/bin/named/update.c
index 169be8b3cb..7923b6cc0c 100644
--- a/bin/named/update.c
+++ b/bin/named/update.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/win32/include/named/ntservice.h b/bin/named/win32/include/named/ntservice.h
index a5e4ab4e31..b5e2a1e069 100644
--- a/bin/named/win32/include/named/ntservice.h
+++ b/bin/named/win32/include/named/ntservice.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/win32/include/named/os.h b/bin/named/win32/include/named/os.h
index d2a03ed384..cd0baba75b 100644
--- a/bin/named/win32/include/named/os.h
+++ b/bin/named/win32/include/named/os.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/win32/ntservice.c b/bin/named/win32/ntservice.c
index 3b54150693..bba2877b03 100644
--- a/bin/named/win32/ntservice.c
+++ b/bin/named/win32/ntservice.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/win32/os.c b/bin/named/win32/os.c
index da36d1d0af..93fecdeb5a 100644
--- a/bin/named/win32/os.c
+++ b/bin/named/win32/os.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index bc64caedcb..5d4f6b0a7d 100644
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 2dabbe5e38..303c4cf170 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index a7e0a7f2be..b77b03de4e 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 9ef5d2e0f9..0fd6053bdb 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index c2bc1b7100..ffaea2f73f 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -36,6 +35,10 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -52,13 +55,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index d7eee6ade5..2380cea2dc 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/rndc/include/rndc/os.h b/bin/rndc/include/rndc/os.h
index 36dee3a394..8a55a7a013 100644
--- a/bin/rndc/include/rndc/os.h
+++ b/bin/rndc/include/rndc/os.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 482e02417f..7cea62e3df 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/rndc/rndc.conf b/bin/rndc/rndc.conf
index c421a1940a..e17d2240e1 100644
--- a/bin/rndc/rndc.conf
+++ b/bin/rndc/rndc.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/rndc/rndc.conf.docbook b/bin/rndc/rndc.conf.docbook
index 9011106c6a..c3cec0cdf1 100644
--- a/bin/rndc/rndc.conf.docbook
+++ b/bin/rndc/rndc.conf.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -47,11 +48,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/rndc/rndc.docbook b/bin/rndc/rndc.docbook
index 374f8a2f60..e9f62b4c67 100644
--- a/bin/rndc/rndc.docbook
+++ b/bin/rndc/rndc.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -38,6 +37,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -49,11 +50,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/bin/rndc/util.c b/bin/rndc/util.c
index dcc78a91bb..8d4c05c0be 100644
--- a/bin/rndc/util.c
+++ b/bin/rndc/util.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/rndc/util.h b/bin/rndc/util.h
index a193842ad4..8d5e4c153f 100644
--- a/bin/rndc/util.h
+++ b/bin/rndc/util.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index bdefcd1e89..5d72842e28 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/cfg_test.c b/bin/tests/cfg_test.c
index 9e4b693775..ffab00f435 100644
--- a/bin/tests/cfg_test.c
+++ b/bin/tests/cfg_test.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in
index 39562d9879..ff169b07ae 100644
--- a/bin/tests/headerdep_test.sh.in
+++ b/bin/tests/headerdep_test.sh.in
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/named.conf b/bin/tests/named.conf
index e03bd57e09..7f3022ec2d 100644
--- a/bin/tests/named.conf
+++ b/bin/tests/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/optional/rbt_test.txt b/bin/tests/optional/rbt_test.txt
index 7ee867c9ee..e1f47a7dd5 100644
--- a/bin/tests/optional/rbt_test.txt
+++ b/bin/tests/optional/rbt_test.txt
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index da00eec1df..6d62fc403a 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/README b/bin/tests/system/README
index 23cff6cc71..f527e790d4 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Introduction
diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index c6736fe636..bcc1446cf2 100644
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/cacheclean/ns1/example.db b/bin/tests/system/cacheclean/ns1/example.db
index f9c6edb12d..2847571220 100644
--- a/bin/tests/system/cacheclean/ns1/example.db
+++ b/bin/tests/system/cacheclean/ns1/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/cacheclean/ns1/named.conf.in b/bin/tests/system/cacheclean/ns1/named.conf.in
index 9e0eb216ae..20198acd69 100644
--- a/bin/tests/system/cacheclean/ns1/named.conf.in
+++ b/bin/tests/system/cacheclean/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/cacheclean/ns2/named.conf.in b/bin/tests/system/cacheclean/ns2/named.conf.in
index 397f16485e..eebba644f1 100644
--- a/bin/tests/system/cacheclean/ns2/named.conf.in
+++ b/bin/tests/system/cacheclean/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh
index 5b9e9cc87f..a930358b25 100755
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/chain/README b/bin/tests/system/chain/README
index c7c45f1124..f51c123b72 100644
--- a/bin/tests/system/chain/README
+++ b/bin/tests/system/chain/README
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 ns1 is the root server.
 
 ns2 and ns5 are both authoritative servers.
diff --git a/bin/tests/system/chain/ans4/README.anspy b/bin/tests/system/chain/ans4/README.anspy
index d7a5e943ce..a419c61a28 100644
--- a/bin/tests/system/chain/ans4/README.anspy
+++ b/bin/tests/system/chain/ans4/README.anspy
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 REQUIREMENTS
 ans.py requires at least dnspython 1.12.0.
 
diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index fe3d98ef53..2745a5eba1 100644
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf
index c130ec6608..8093c8ed6a 100644
--- a/bin/tests/system/common/controls.conf
+++ b/bin/tests/system/common/controls.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf
index de43d99028..f4f780cdbc 100644
--- a/bin/tests/system/common/rndc.conf
+++ b/bin/tests/system/common/rndc.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/common/root.hint
index 237e39f417..9a5ff8e158 100644
--- a/bin/tests/system/common/root.hint
+++ b/bin/tests/system/common/root.hint
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index bf64d53543..6a44384fb4 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns1/example.db b/bin/tests/system/dialup/ns1/example.db
index 0687da0c92..78fb294936 100644
--- a/bin/tests/system/dialup/ns1/example.db
+++ b/bin/tests/system/dialup/ns1/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf
index a38eb5548e..7fe8729f32 100644
--- a/bin/tests/system/dialup/ns1/named.conf
+++ b/bin/tests/system/dialup/ns1/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns1/root.db b/bin/tests/system/dialup/ns1/root.db
index aed8e05504..f85c55cd8b 100644
--- a/bin/tests/system/dialup/ns1/root.db
+++ b/bin/tests/system/dialup/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns2/hint.db b/bin/tests/system/dialup/ns2/hint.db
index b2d19c6840..fad1b9d6f4 100644
--- a/bin/tests/system/dialup/ns2/hint.db
+++ b/bin/tests/system/dialup/ns2/hint.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf
index ae437207f3..c452699fc4 100644
--- a/bin/tests/system/dialup/ns2/named.conf
+++ b/bin/tests/system/dialup/ns2/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns3/hint.db b/bin/tests/system/dialup/ns3/hint.db
index f938f5ed21..dd3a17518f 100644
--- a/bin/tests/system/dialup/ns3/hint.db
+++ b/bin/tests/system/dialup/ns3/hint.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf
index 462f1e4b3e..3f42f6994a 100644
--- a/bin/tests/system/dialup/ns3/named.conf
+++ b/bin/tests/system/dialup/ns3/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh
index 3bc8967424..bba767d31a 100644
--- a/bin/tests/system/dialup/setup.sh
+++ b/bin/tests/system/dialup/setup.sh
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh
index c7ca3b3d79..48f6ea4145 100644
--- a/bin/tests/system/dialup/tests.sh
+++ b/bin/tests/system/dialup/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl
index 201799126b..549158af7a 100644
--- a/bin/tests/system/digcomp.pl
+++ b/bin/tests/system/digcomp.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
index 7b5c792997..be99eb3e71 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/DNAME=10=example.net.=
@@ -1,4 +1,6 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 The contents of this file is not read by the filesystem driver.
 This is the file for "DNAME 10 example.net.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
index d94fabf855..cca17c384a 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/NS=10=example.com.=
@@ -1,4 +1,6 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 The contents of this file is not read by the filesystem driver.
 This is the file for "NS 10 example.com.".
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None= b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
index 465f1d5c0f..f2ca5de86b 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/broken/dns.d/@/SOA=10=ns.example.com.=root.example.com.=None=None=None=None=None=
@@ -1,4 +1,6 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 The contents of this file is not read by the filesystem driver.
 This is the file for "SOA 10 ns.example.com. root.example.com. 2010062900 None None None None" which is a malformed SOA record.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
index d97400258c..f5f98dd433 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/DNAME=10=example.net.=
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: DNAME=10=example.net.=,v 1.2 2010/08/16 04:46:15 marka Exp $
 
 The contents of this file is not read by the filesystem driver.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
index 6e6722cb78..baf3b1c1d1 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: NS=10=example.com.=,v 1.1 2010/08/16 04:46:15 marka Exp $
 
 The contents of this file is not read by the filesystem driver.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10= b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
index d23e0c4142..f684476fda 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=,v 1.1 2010/08/16 04:46:15 marka Exp $
 
 The contents of this file is not read by the filesystem driver.
diff --git a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1 b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
index e605146dea..d9e52cd725 100644
--- a/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
+++ b/bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: 10.53.0.1,v 1.2 2010/08/16 04:46:16 marka Exp $
 
 The contents of this file are not read by the filesystem driver.
diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README
index a8fa7b6ebb..65ef6018d4 100644
--- a/bin/tests/system/dnssec/README
+++ b/bin/tests/system/dnssec/README
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: README,v 1.10 2011/01/04 23:47:13 tbox Exp $
diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 10229163be..e367626a03 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl
index eb968eab49..79433f7b16 100644
--- a/bin/tests/system/dnssec/dnssec_update_test.pl
+++ b/bin/tests/system/dnssec/dnssec_update_test.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns1/named.conf.in b/bin/tests/system/dnssec/ns1/named.conf.in
index d21c4a8552..1470ea2b31 100644
--- a/bin/tests/system/dnssec/ns1/named.conf.in
+++ b/bin/tests/system/dnssec/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in
index db6d82a92d..3261c46b83 100644
--- a/bin/tests/system/dnssec/ns1/root.db.in
+++ b/bin/tests/system/dnssec/ns1/root.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 433463b957..53c3dd376f 100644
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in
index 02fd1d6b78..c3300bfb44 100644
--- a/bin/tests/system/dnssec/ns2/example.db.in
+++ b/bin/tests/system/dnssec/ns2/example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns2/insecure.secure.example.db b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
index aa857cf3b5..20e93a7f22 100644
--- a/bin/tests/system/dnssec/ns2/insecure.secure.example.db
+++ b/bin/tests/system/dnssec/ns2/insecure.secure.example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns2/named.conf.in b/bin/tests/system/dnssec/ns2/named.conf.in
index 08a18f3044..4d6b011852 100644
--- a/bin/tests/system/dnssec/ns2/named.conf.in
+++ b/bin/tests/system/dnssec/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
index 4998f933f2..81bf265185 100644
--- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in
+++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 3811ccc818..8364f42220 100644
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in
index 3c0a4d7e40..587101e7fb 100644
--- a/bin/tests/system/dnssec/ns3/bogus.example.db.in
+++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/dynamic.example.db.in b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
index 4d7db0e6f2..14cfbacedf 100644
--- a/bin/tests/system/dnssec/ns3/dynamic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/dynamic.example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/generic.example.db.in b/bin/tests/system/dnssec/ns3/generic.example.db.in
index 417b62c856..a73168eb41 100644
--- a/bin/tests/system/dnssec/ns3/generic.example.db.in
+++ b/bin/tests/system/dnssec/ns3/generic.example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db
index bad5dfa4e3..195d850b3e 100644
--- a/bin/tests/system/dnssec/ns3/insecure.example.db
+++ b/bin/tests/system/dnssec/ns3/insecure.example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/named.conf.in b/bin/tests/system/dnssec/ns3/named.conf.in
index 2fd5cfe52f..9fe8917d70 100644
--- a/bin/tests/system/dnssec/ns3/named.conf.in
+++ b/bin/tests/system/dnssec/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in
index 8804d0c0da..56fd81d4d4 100644
--- a/bin/tests/system/dnssec/ns3/secure.example.db.in
+++ b/bin/tests/system/dnssec/ns3/secure.example.db.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 615894b85d..92e2d62b2e 100644
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns5/named1.conf.in b/bin/tests/system/dnssec/ns5/named1.conf.in
index 98213fd82e..b9312074de 100644
--- a/bin/tests/system/dnssec/ns5/named1.conf.in
+++ b/bin/tests/system/dnssec/ns5/named1.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns5/named2.conf.in b/bin/tests/system/dnssec/ns5/named2.conf.in
index f0a286a66b..5074128931 100644
--- a/bin/tests/system/dnssec/ns5/named2.conf.in
+++ b/bin/tests/system/dnssec/ns5/named2.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad
index 1124fab86d..9630d1a8db 100644
--- a/bin/tests/system/dnssec/ns5/trusted.conf.bad
+++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/ns7/named.nosoa b/bin/tests/system/dnssec/ns7/named.nosoa
index 7e1cb092bf..21d970b965 100644
--- a/bin/tests/system/dnssec/ns7/named.nosoa
+++ b/bin/tests/system/dnssec/ns7/named.nosoa
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: named.nosoa,v 1.3 2010/06/26 23:46:49 tbox Exp $
 
 Add -T nosoa.
diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index a2f628323f..35e40c23e4 100644
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 274923728f..45e0020801 100644
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -e
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index b49e69f7d4..4a3a1ee248 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index 16a379d6c6..706a8c03ed 100644
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns1/named.conf.in b/bin/tests/system/forward/ns1/named.conf.in
index d4488234a2..fdbd055569 100644
--- a/bin/tests/system/forward/ns1/named.conf.in
+++ b/bin/tests/system/forward/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns1/root.db b/bin/tests/system/forward/ns1/root.db
index 66c0d33da9..0b414b35c3 100644
--- a/bin/tests/system/forward/ns1/root.db
+++ b/bin/tests/system/forward/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns2/named.conf.in b/bin/tests/system/forward/ns2/named.conf.in
index 1f74dbf446..4c59fedab5 100644
--- a/bin/tests/system/forward/ns2/named.conf.in
+++ b/bin/tests/system/forward/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns2/root.db b/bin/tests/system/forward/ns2/root.db
index 66c0d33da9..0b414b35c3 100644
--- a/bin/tests/system/forward/ns2/root.db
+++ b/bin/tests/system/forward/ns2/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns3/named.conf.in b/bin/tests/system/forward/ns3/named.conf.in
index 3cd6838561..92a64f3559 100644
--- a/bin/tests/system/forward/ns3/named.conf.in
+++ b/bin/tests/system/forward/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns3/root.db b/bin/tests/system/forward/ns3/root.db
index 66c0d33da9..0b414b35c3 100644
--- a/bin/tests/system/forward/ns3/root.db
+++ b/bin/tests/system/forward/ns3/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns4/named.conf.in b/bin/tests/system/forward/ns4/named.conf.in
index 4b8576aa80..77a6a20573 100644
--- a/bin/tests/system/forward/ns4/named.conf.in
+++ b/bin/tests/system/forward/ns4/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/ns4/root.db b/bin/tests/system/forward/ns4/root.db
index 66c0d33da9..0b414b35c3 100644
--- a/bin/tests/system/forward/ns4/root.db
+++ b/bin/tests/system/forward/ns4/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh
index b5f00c35ac..c0caf35a14 100644
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh
index 402ea31b1d..12795f7506 100644
--- a/bin/tests/system/genzone.sh
+++ b/bin/tests/system/genzone.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index e382c610c4..22cd741199 100644
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in
index 282eed9630..fb866ece6a 100644
--- a/bin/tests/system/glue/ns1/cache.in
+++ b/bin/tests/system/glue/ns1/cache.in
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db
index 45ca2aacc4..23d86391db 100644
--- a/bin/tests/system/glue/ns1/mil.db
+++ b/bin/tests/system/glue/ns1/mil.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/named.conf.in b/bin/tests/system/glue/ns1/named.conf.in
index b918aea504..fce37f7aae 100644
--- a/bin/tests/system/glue/ns1/named.conf.in
+++ b/bin/tests/system/glue/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db
index 714c727b90..8a5efdde27 100644
--- a/bin/tests/system/glue/ns1/net.db
+++ b/bin/tests/system/glue/ns1/net.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db
index 51fb463fdf..c20eb9d8e9 100644
--- a/bin/tests/system/glue/ns1/root-servers.nil.db
+++ b/bin/tests/system/glue/ns1/root-servers.nil.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db
index f5d5e4bc6a..90673d93b6 100644
--- a/bin/tests/system/glue/ns1/root.db
+++ b/bin/tests/system/glue/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh
index 388eb27b55..226bdf5346 100644
--- a/bin/tests/system/glue/setup.sh
+++ b/bin/tests/system/glue/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh
index 924d009fe4..81bd7a7e50 100644
--- a/bin/tests/system/glue/tests.sh
+++ b/bin/tests/system/glue/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 86a36220c1..d1784cdf3c 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index 100b3a8dfa..9e965fb72b 100644
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh
index c47a79d895..3a9513b52d 100644
--- a/bin/tests/system/ixfr/prereq.sh
+++ b/bin/tests/system/ixfr/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 75f37a9bb5..8b1f28fb4d 100644
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh
index 3b9abea0a4..21d0ef5212 100644
--- a/bin/tests/system/ixfr/tests.sh
+++ b/bin/tests/system/ixfr/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index 11054dbca7..8e60e58c93 100644
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db
index 2d4fe79678..607070811f 100644
--- a/bin/tests/system/limits/ns1/example.db
+++ b/bin/tests/system/limits/ns1/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/limits/ns1/named.conf.in b/bin/tests/system/limits/ns1/named.conf.in
index bd259ecc49..f3cfb908f2 100644
--- a/bin/tests/system/limits/ns1/named.conf.in
+++ b/bin/tests/system/limits/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db
index 2a05074384..24016cf4cc 100644
--- a/bin/tests/system/limits/ns1/root.db
+++ b/bin/tests/system/limits/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh
index e6305a32a8..bfcb9b8104 100644
--- a/bin/tests/system/limits/tests.sh
+++ b/bin/tests/system/limits/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index 9d73d299ac..57bde87368 100644
--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf
index eade24ea5b..0297264a5b 100644
--- a/bin/tests/system/lwresd/lwresd1/lwresd.conf
+++ b/bin/tests/system/lwresd/lwresd1/lwresd.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf
index 57743e9c8c..3b54ed8a9c 100644
--- a/bin/tests/system/lwresd/lwresd1/resolv.conf
+++ b/bin/tests/system/lwresd/lwresd1/resolv.conf
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c
index 31b0c273f2..cea5056951 100644
--- a/bin/tests/system/lwresd/lwtest.c
+++ b/bin/tests/system/lwresd/lwtest.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
index c0f5685629..4ea3c098e2 100644
--- a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
+++ b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db
index 83a2666d0c..2ead7a3125 100644
--- a/bin/tests/system/lwresd/ns1/example1.db
+++ b/bin/tests/system/lwresd/ns1/example1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db
index 4cbd9a7ffd..7894ca741f 100644
--- a/bin/tests/system/lwresd/ns1/example2.db
+++ b/bin/tests/system/lwresd/ns1/example2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db
index a8b42c42f1..14e9ae875f 100644
--- a/bin/tests/system/lwresd/ns1/ip6.arpa.db
+++ b/bin/tests/system/lwresd/ns1/ip6.arpa.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db
index 7680d2d9d1..eb8317ccda 100644
--- a/bin/tests/system/lwresd/ns1/ip6.int.db
+++ b/bin/tests/system/lwresd/ns1/ip6.int.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf
index 85c74c2e14..fc1629058e 100644
--- a/bin/tests/system/lwresd/ns1/named.conf
+++ b/bin/tests/system/lwresd/ns1/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db
index 031f81fec6..b915272d0e 100644
--- a/bin/tests/system/lwresd/ns1/root.db
+++ b/bin/tests/system/lwresd/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf
index 57743e9c8c..3b54ed8a9c 100644
--- a/bin/tests/system/lwresd/resolv.conf
+++ b/bin/tests/system/lwresd/resolv.conf
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh
index a741619ad7..e40069ac4c 100644
--- a/bin/tests/system/lwresd/tests.sh
+++ b/bin/tests/system/lwresd/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index 0f49fb59e4..fc91609874 100644
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/ns1/include.db b/bin/tests/system/masterfile/ns1/include.db
index ce6b328274..e0ebd91418 100644
--- a/bin/tests/system/masterfile/ns1/include.db
+++ b/bin/tests/system/masterfile/ns1/include.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/ns1/named.conf.in b/bin/tests/system/masterfile/ns1/named.conf.in
index 0947452367..75c9a7ddb5 100644
--- a/bin/tests/system/masterfile/ns1/named.conf.in
+++ b/bin/tests/system/masterfile/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/ns1/sub.db b/bin/tests/system/masterfile/ns1/sub.db
index af1658395f..a226660cd4 100644
--- a/bin/tests/system/masterfile/ns1/sub.db
+++ b/bin/tests/system/masterfile/ns1/sub.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/ns1/ttl1.db b/bin/tests/system/masterfile/ns1/ttl1.db
index e4ba11ebca..39205e810b 100644
--- a/bin/tests/system/masterfile/ns1/ttl1.db
+++ b/bin/tests/system/masterfile/ns1/ttl1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/ns1/ttl2.db b/bin/tests/system/masterfile/ns1/ttl2.db
index a46d376bd1..eb3cd4077a 100644
--- a/bin/tests/system/masterfile/ns1/ttl2.db
+++ b/bin/tests/system/masterfile/ns1/ttl2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh
index ec17c63822..9e70fe42ff 100644
--- a/bin/tests/system/masterfile/tests.sh
+++ b/bin/tests/system/masterfile/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 07f2332787..87863d19db 100644
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns1/named.conf.in b/bin/tests/system/notify/ns1/named.conf.in
index bc08f49a57..742d40080f 100644
--- a/bin/tests/system/notify/ns1/named.conf.in
+++ b/bin/tests/system/notify/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db
index 5bfee8a21c..20c9b74f5f 100644
--- a/bin/tests/system/notify/ns1/root.db
+++ b/bin/tests/system/notify/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db
index d79499a2e4..ed423a8514 100644
--- a/bin/tests/system/notify/ns2/example1.db
+++ b/bin/tests/system/notify/ns2/example1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db
index 8adde206b4..96a108939b 100644
--- a/bin/tests/system/notify/ns2/example2.db
+++ b/bin/tests/system/notify/ns2/example2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db
index 41cf82338b..848ff712cd 100644
--- a/bin/tests/system/notify/ns2/example3.db
+++ b/bin/tests/system/notify/ns2/example3.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db
index d33569bd2d..ed031f3624 100644
--- a/bin/tests/system/notify/ns2/example4.db
+++ b/bin/tests/system/notify/ns2/example4.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns2/named.conf.in b/bin/tests/system/notify/ns2/named.conf.in
index abe6a0d18c..ead77b0e7a 100644
--- a/bin/tests/system/notify/ns2/named.conf.in
+++ b/bin/tests/system/notify/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/ns3/named.conf.in b/bin/tests/system/notify/ns3/named.conf.in
index 5370dd27e4..00d4be4c80 100644
--- a/bin/tests/system/notify/ns3/named.conf.in
+++ b/bin/tests/system/notify/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh
index d064d6c897..a2230d79f8 100644
--- a/bin/tests/system/notify/setup.sh
+++ b/bin/tests/system/notify/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh
index efa3c38151..308bd5576e 100644
--- a/bin/tests/system/notify/tests.sh
+++ b/bin/tests/system/notify/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index dbf8ece458..07d646bed4 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/ns1/example1.db b/bin/tests/system/nsupdate/ns1/example1.db
index bbcda1e781..e359cc4f6e 100644
--- a/bin/tests/system/nsupdate/ns1/example1.db
+++ b/bin/tests/system/nsupdate/ns1/example1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/ns1/named.conf.in b/bin/tests/system/nsupdate/ns1/named.conf.in
index 6d8668b688..128f219fd4 100644
--- a/bin/tests/system/nsupdate/ns1/named.conf.in
+++ b/bin/tests/system/nsupdate/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/ns2/named.conf.in b/bin/tests/system/nsupdate/ns2/named.conf.in
index ffbdb92b7b..85bc62af59 100644
--- a/bin/tests/system/nsupdate/ns2/named.conf.in
+++ b/bin/tests/system/nsupdate/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 68b464c126..6783494bd9 100644
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh
index f8d2688d87..e8a2caf692 100644
--- a/bin/tests/system/nsupdate/tests.sh
+++ b/bin/tests/system/nsupdate/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl
index 063858aff5..d79076798a 100644
--- a/bin/tests/system/nsupdate/update_test.pl
+++ b/bin/tests/system/nsupdate/update_test.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/reclimit/README b/bin/tests/system/reclimit/README
index 250d29c2d0..bb7f596c53 100644
--- a/bin/tests/system/reclimit/README
+++ b/bin/tests/system/reclimit/README
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 system test for recursion limits
 
 ns1  -- root server
diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl
index 2c24cfd876..a9002d483f 100644
--- a/bin/tests/system/resolver/ans2/ans.pl
+++ b/bin/tests/system/resolver/ans2/ans.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl
index 271379d2d4..28eb612f1a 100644
--- a/bin/tests/system/resolver/ans3/ans.pl
+++ b/bin/tests/system/resolver/ans3/ans.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/resolver/ns1/named.conf.in b/bin/tests/system/resolver/ns1/named.conf.in
index 3cb26c9dd0..2523da52c4 100644
--- a/bin/tests/system/resolver/ns1/named.conf.in
+++ b/bin/tests/system/resolver/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint
index 0a6f3c2d13..dd101c2f3b 100644
--- a/bin/tests/system/resolver/ns1/root.hint
+++ b/bin/tests/system/resolver/ns1/root.hint
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/resolver/ns4/named.noaa b/bin/tests/system/resolver/ns4/named.noaa
index b243ab09da..38a96fbb9b 100644
--- a/bin/tests/system/resolver/ns4/named.noaa
+++ b/bin/tests/system/resolver/ns4/named.noaa
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: named.noaa,v 1.2 2010/09/15 12:07:56 marka Exp $
 
 Add -T noaa.
diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index 42770f344d..afd1053bc7 100644
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 83d59170bc..b7e3fdd7e5 100755
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index a327e54f6d..3b1cd3d74c 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 74dea81bc1..af07cc66a4 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl
index 5ab7876367..ccfdbd1e3f 100644
--- a/bin/tests/system/send.pl
+++ b/bin/tests/system/send.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh
index c8bedd7845..d0c56be69d 100644
--- a/bin/tests/system/setup.sh
+++ b/bin/tests/system/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 4251101a9f..752089c343 100644
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/sortlist/ns1/example.db b/bin/tests/system/sortlist/ns1/example.db
index dcce04b9d1..d59bce3cca 100644
--- a/bin/tests/system/sortlist/ns1/example.db
+++ b/bin/tests/system/sortlist/ns1/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/sortlist/ns1/named.conf.in b/bin/tests/system/sortlist/ns1/named.conf.in
index 537eb9ae9c..1b87705a76 100644
--- a/bin/tests/system/sortlist/ns1/named.conf.in
+++ b/bin/tests/system/sortlist/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/sortlist/ns1/root.db b/bin/tests/system/sortlist/ns1/root.db
index 805bb8c08e..b1c9044118 100644
--- a/bin/tests/system/sortlist/ns1/root.db
+++ b/bin/tests/system/sortlist/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index 0bbb062b26..5f46588c86 100644
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index f4924b0b99..924de22231 100755
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh
index 186c2b7e50..706f0db06a 100644
--- a/bin/tests/system/start.sh
+++ b/bin/tests/system/start.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 0f6ddd5e39..21a1fdb323 100644
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh
index 44d0667619..a1d4cbb2df 100644
--- a/bin/tests/system/stop.sh
+++ b/bin/tests/system/stop.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh
index 163667a3cd..26ae2b43ed 100644
--- a/bin/tests/system/stress/clean.sh
+++ b/bin/tests/system/stress/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf
index 5cc68cdc80..191529e5dd 100644
--- a/bin/tests/system/stress/ns1/named.conf
+++ b/bin/tests/system/stress/ns1/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf
index 1298f51a18..4abb1ae3e6 100644
--- a/bin/tests/system/stress/ns2/named.conf
+++ b/bin/tests/system/stress/ns2/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf
index 30abcec212..19fe963529 100644
--- a/bin/tests/system/stress/ns3/named.conf
+++ b/bin/tests/system/stress/ns3/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf
index 5a3db653f2..4d1d310701 100644
--- a/bin/tests/system/stress/ns4/named.conf
+++ b/bin/tests/system/stress/ns4/named.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl
index 98e15604d2..721c06beda 100644
--- a/bin/tests/system/stress/setup.pl
+++ b/bin/tests/system/stress/setup.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index f404f580a5..4419ccc475 100644
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh
index a076bc851c..d4781cfd39 100644
--- a/bin/tests/system/stress/tests.sh
+++ b/bin/tests/system/stress/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stress/update.pl b/bin/tests/system/stress/update.pl
index 57a6389f5e..21d6b7de4f 100644
--- a/bin/tests/system/stress/update.pl
+++ b/bin/tests/system/stress/update.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index 7302c21f49..4d1c4d36bb 100644
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns1/named.conf.in b/bin/tests/system/stub/ns1/named.conf.in
index bc08f49a57..742d40080f 100644
--- a/bin/tests/system/stub/ns1/named.conf.in
+++ b/bin/tests/system/stub/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db
index c3b44b636c..e289989f6d 100644
--- a/bin/tests/system/stub/ns1/root.db
+++ b/bin/tests/system/stub/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db
index c480f5c8a5..29480dd463 100644
--- a/bin/tests/system/stub/ns2/child.example.db
+++ b/bin/tests/system/stub/ns2/child.example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns2/named.conf.in b/bin/tests/system/stub/ns2/named.conf.in
index fb18b16a7d..f5708605a7 100644
--- a/bin/tests/system/stub/ns2/named.conf.in
+++ b/bin/tests/system/stub/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db
index ccefc068cd..e4361e530c 100644
--- a/bin/tests/system/stub/ns3/example.db
+++ b/bin/tests/system/stub/ns3/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/ns3/named.conf.in b/bin/tests/system/stub/ns3/named.conf.in
index da597e2ed7..cea6a19d6b 100644
--- a/bin/tests/system/stub/ns3/named.conf.in
+++ b/bin/tests/system/stub/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh
index 36af67bab0..0cfc29d2cf 100644
--- a/bin/tests/system/stub/tests.sh
+++ b/bin/tests/system/stub/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl
index 96b53997d5..8c6be1d02f 100644
--- a/bin/tests/system/testsock.pl
+++ b/bin/tests/system/testsock.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index bf340b02fb..8b497bc513 100644
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index 6266ab4acb..8f99f29321 100644
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c
index 9a780404db..f96feaca32 100644
--- a/bin/tests/system/tkey/keycreate.c
+++ b/bin/tests/system/tkey/keycreate.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c
index c403d3280a..60f4435a84 100644
--- a/bin/tests/system/tkey/keydelete.c
+++ b/bin/tests/system/tkey/keydelete.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in
index 8a9241cbad..fce245c3b3 100644
--- a/bin/tests/system/tkey/ns1/named.conf.in
+++ b/bin/tests/system/tkey/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh
index 1ef9afdc88..e3c9ad2a1c 100644
--- a/bin/tests/system/tkey/ns1/setup.sh
+++ b/bin/tests/system/tkey/ns1/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh
index 552bf569ba..5f298e28c8 100644
--- a/bin/tests/system/tkey/prereq.sh
+++ b/bin/tests/system/tkey/prereq.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index eabb8c14ae..65ffa91fdb 100644
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh
index bf1a0a88fd..6dde5a4552 100644
--- a/bin/tests/system/tkey/tests.sh
+++ b/bin/tests/system/tkey/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index fab1795b09..0d9cb4ca46 100644
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/broken1.db b/bin/tests/system/unknown/ns1/broken1.db
index 87a00df093..b2997f3ed0 100644
--- a/bin/tests/system/unknown/ns1/broken1.db
+++ b/bin/tests/system/unknown/ns1/broken1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/broken2.db b/bin/tests/system/unknown/ns1/broken2.db
index f857244396..4b2011cead 100644
--- a/bin/tests/system/unknown/ns1/broken2.db
+++ b/bin/tests/system/unknown/ns1/broken2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/broken3.db b/bin/tests/system/unknown/ns1/broken3.db
index 1d93048f45..8cbeb1a896 100644
--- a/bin/tests/system/unknown/ns1/broken3.db
+++ b/bin/tests/system/unknown/ns1/broken3.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/broken4.db b/bin/tests/system/unknown/ns1/broken4.db
index 08dcd19db7..6e2482a041 100644
--- a/bin/tests/system/unknown/ns1/broken4.db
+++ b/bin/tests/system/unknown/ns1/broken4.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/broken5.db b/bin/tests/system/unknown/ns1/broken5.db
index ed05bf4942..695d7cfd2d 100644
--- a/bin/tests/system/unknown/ns1/broken5.db
+++ b/bin/tests/system/unknown/ns1/broken5.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/class10.hints b/bin/tests/system/unknown/ns1/class10.hints
index aa2857468e..31e416f634 100644
--- a/bin/tests/system/unknown/ns1/class10.hints
+++ b/bin/tests/system/unknown/ns1/class10.hints
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/example-class10.db b/bin/tests/system/unknown/ns1/example-class10.db
index 3db6d078d7..9af862403e 100644
--- a/bin/tests/system/unknown/ns1/example-class10.db
+++ b/bin/tests/system/unknown/ns1/example-class10.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/example-in.db b/bin/tests/system/unknown/ns1/example-in.db
index c7680a52d6..b6237f872f 100644
--- a/bin/tests/system/unknown/ns1/example-in.db
+++ b/bin/tests/system/unknown/ns1/example-in.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/ns1/named.conf.in b/bin/tests/system/unknown/ns1/named.conf.in
index 97f60d2082..51693013d8 100644
--- a/bin/tests/system/unknown/ns1/named.conf.in
+++ b/bin/tests/system/unknown/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh
index 78d9f42e2b..a92a2a62f2 100644
--- a/bin/tests/system/unknown/tests.sh
+++ b/bin/tests/system/unknown/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index 4fd997ce22..b041f145f4 100644
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/ns1/example1.db b/bin/tests/system/upforwd/ns1/example1.db
index e765d3485e..094881776c 100644
--- a/bin/tests/system/upforwd/ns1/example1.db
+++ b/bin/tests/system/upforwd/ns1/example1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/ns1/named.conf.in b/bin/tests/system/upforwd/ns1/named.conf.in
index 461a1b0042..5d6cb1a663 100644
--- a/bin/tests/system/upforwd/ns1/named.conf.in
+++ b/bin/tests/system/upforwd/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/ns2/named.conf.in b/bin/tests/system/upforwd/ns2/named.conf.in
index 2fff8fb45d..53c32808fd 100644
--- a/bin/tests/system/upforwd/ns2/named.conf.in
+++ b/bin/tests/system/upforwd/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/ns3/named.conf.in b/bin/tests/system/upforwd/ns3/named.conf.in
index 9ef9f51289..81ef1aff6b 100644
--- a/bin/tests/system/upforwd/ns3/named.conf.in
+++ b/bin/tests/system/upforwd/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh
index 40b48de532..1ccfb8fe52 100644
--- a/bin/tests/system/upforwd/setup.sh
+++ b/bin/tests/system/upforwd/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh
index fbb574d32a..3e8cb53f58 100644
--- a/bin/tests/system/upforwd/tests.sh
+++ b/bin/tests/system/upforwd/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index 5ab9040f80..fc2a4d4697 100644
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns1/named.conf.in b/bin/tests/system/views/ns1/named.conf.in
index bc08f49a57..742d40080f 100644
--- a/bin/tests/system/views/ns1/named.conf.in
+++ b/bin/tests/system/views/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db
index 319abd37af..102fa5c60a 100644
--- a/bin/tests/system/views/ns1/root.db
+++ b/bin/tests/system/views/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db
index c535051028..21aeb6e689 100644
--- a/bin/tests/system/views/ns2/example1.db
+++ b/bin/tests/system/views/ns2/example1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db
index aa82d2b9f6..c98ba50939 100644
--- a/bin/tests/system/views/ns2/example2.db
+++ b/bin/tests/system/views/ns2/example2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db
index 13fd01b666..9c3a581cb6 100644
--- a/bin/tests/system/views/ns2/internal.db
+++ b/bin/tests/system/views/ns2/internal.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns2/named1.conf.in b/bin/tests/system/views/ns2/named1.conf.in
index 03918c4cfd..fa90f2d016 100644
--- a/bin/tests/system/views/ns2/named1.conf.in
+++ b/bin/tests/system/views/ns2/named1.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns2/named2.conf.in b/bin/tests/system/views/ns2/named2.conf.in
index 0706e2fa91..bbcd14dc72 100644
--- a/bin/tests/system/views/ns2/named2.conf.in
+++ b/bin/tests/system/views/ns2/named2.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db
index 7596635217..f17061f4b5 100644
--- a/bin/tests/system/views/ns3/internal.db
+++ b/bin/tests/system/views/ns3/internal.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns3/named1.conf.in b/bin/tests/system/views/ns3/named1.conf.in
index 09f7e12273..6c7a49d760 100644
--- a/bin/tests/system/views/ns3/named1.conf.in
+++ b/bin/tests/system/views/ns3/named1.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/ns3/named2.conf.in b/bin/tests/system/views/ns3/named2.conf.in
index 23c087ec53..b8fa08720d 100644
--- a/bin/tests/system/views/ns3/named2.conf.in
+++ b/bin/tests/system/views/ns3/named2.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh
index 88c8854a64..1cece1a724 100644
--- a/bin/tests/system/views/setup.sh
+++ b/bin/tests/system/views/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 7b8fabb128..64163eef0f 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh
index d50ed2c65e..631a0309f7 100644
--- a/bin/tests/system/xfer/clean.sh
+++ b/bin/tests/system/xfer/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/ns1/named.conf.in b/bin/tests/system/xfer/ns1/named.conf.in
index cfde6c198e..dedee57bd6 100644
--- a/bin/tests/system/xfer/ns1/named.conf.in
+++ b/bin/tests/system/xfer/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db
index 4eca205196..d2f61ab0ef 100644
--- a/bin/tests/system/xfer/ns1/root.db
+++ b/bin/tests/system/xfer/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/ns2/named.conf.in b/bin/tests/system/xfer/ns2/named.conf.in
index 4efc712cbe..d2b6ef0f10 100644
--- a/bin/tests/system/xfer/ns2/named.conf.in
+++ b/bin/tests/system/xfer/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/ns3/named.conf.in b/bin/tests/system/xfer/ns3/named.conf.in
index 1043096006..9786d80880 100644
--- a/bin/tests/system/xfer/ns3/named.conf.in
+++ b/bin/tests/system/xfer/ns3/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index b84e9d1c0b..657d7bef12 100644
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh
index 06ff1db062..14496204b7 100755
--- a/bin/tests/system/xfer/tests.sh
+++ b/bin/tests/system/xfer/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index 4d8dc7aae1..b16b1f5eab 100644
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db
index 4eb34d431b..1091ca6e1b 100644
--- a/bin/tests/system/xferquota/ns1/changing1.db
+++ b/bin/tests/system/xferquota/ns1/changing1.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db
index 83ee3a1ec9..92b30e39ec 100644
--- a/bin/tests/system/xferquota/ns1/changing2.db
+++ b/bin/tests/system/xferquota/ns1/changing2.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns1/named.conf.in b/bin/tests/system/xferquota/ns1/named.conf.in
index 986f596d05..e143d5b86a 100644
--- a/bin/tests/system/xferquota/ns1/named.conf.in
+++ b/bin/tests/system/xferquota/ns1/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db
index c4b125e298..402b9c4159 100644
--- a/bin/tests/system/xferquota/ns1/root.db
+++ b/bin/tests/system/xferquota/ns1/root.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db
index f91caea802..edd89d0dee 100644
--- a/bin/tests/system/xferquota/ns2/example.db
+++ b/bin/tests/system/xferquota/ns2/example.db
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/ns2/named.conf.in b/bin/tests/system/xferquota/ns2/named.conf.in
index a99d84929f..924237a38b 100644
--- a/bin/tests/system/xferquota/ns2/named.conf.in
+++ b/bin/tests/system/xferquota/ns2/named.conf.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl
index 2ec039c13a..e454673027 100644
--- a/bin/tests/system/xferquota/setup.pl
+++ b/bin/tests/system/xferquota/setup.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh
index a3c2dad490..3f46adaaaf 100644
--- a/bin/tests/system/xferquota/setup.sh
+++ b/bin/tests/system/xferquota/setup.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh
index 42d8875ab3..63e7222624 100755
--- a/bin/tests/system/xferquota/tests.sh
+++ b/bin/tests/system/xferquota/tests.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tests/virtual-time/README b/bin/tests/virtual-time/README
index ca02c0a09d..364816ff05 100644
--- a/bin/tests/virtual-time/README
+++ b/bin/tests/virtual-time/README
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 This is copied from ../system.
 
 This test suite uses a virtual time, gettimeofday(), select(),
diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index 462c2ca59f..c655a3db24 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tools/genrandom.c b/bin/tools/genrandom.c
index f458d573f1..ce30a8d84a 100644
--- a/bin/tools/genrandom.c
+++ b/bin/tools/genrandom.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/tools/named-journalprint.c b/bin/tools/named-journalprint.c
index ddeb010819..e4f6ad4511 100644
--- a/bin/tools/named-journalprint.c
+++ b/bin/tools/named-journalprint.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/AccountInfo.cpp b/bin/win32/BINDInstall/AccountInfo.cpp
index 30ad8cb691..ef45b331e4 100644
--- a/bin/win32/BINDInstall/AccountInfo.cpp
+++ b/bin/win32/BINDInstall/AccountInfo.cpp
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/AccountInfo.h b/bin/win32/BINDInstall/AccountInfo.h
index b787d0e8be..63f563f123 100644
--- a/bin/win32/BINDInstall/AccountInfo.h
+++ b/bin/win32/BINDInstall/AccountInfo.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/BINDInstall.cpp b/bin/win32/BINDInstall/BINDInstall.cpp
index 451b7e747d..5230242567 100644
--- a/bin/win32/BINDInstall/BINDInstall.cpp
+++ b/bin/win32/BINDInstall/BINDInstall.cpp
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/BINDInstall.h b/bin/win32/BINDInstall/BINDInstall.h
index fdd6abddbe..06f873b0a1 100644
--- a/bin/win32/BINDInstall/BINDInstall.h
+++ b/bin/win32/BINDInstall/BINDInstall.h
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp
index 5d9da9464e..1f9afdcc86 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.cpp
+++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/BINDInstallDlg.h b/bin/win32/BINDInstall/BINDInstallDlg.h
index 6b474b3e9a..43bdf2b79b 100644
--- a/bin/win32/BINDInstall/BINDInstallDlg.h
+++ b/bin/win32/BINDInstall/BINDInstallDlg.h
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/DirBrowse.cpp b/bin/win32/BINDInstall/DirBrowse.cpp
index c143b4e33e..f79119a38a 100644
--- a/bin/win32/BINDInstall/DirBrowse.cpp
+++ b/bin/win32/BINDInstall/DirBrowse.cpp
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/bin/win32/BINDInstall/DirBrowse.h b/bin/win32/BINDInstall/DirBrowse.h
index 03ed326d72..77f9c98475 100644
--- a/bin/win32/BINDInstall/DirBrowse.h
+++ b/bin/win32/BINDInstall/DirBrowse.h
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/config.h.win32 b/config.h.win32
index 5fb95fe8cc..11cfe1c2d6 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/configure.in b/configure.in
index 8bdd55d672..291998759b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/conftools/perllib/dnsconf/DNSConf-macros.h b/conftools/perllib/dnsconf/DNSConf-macros.h
index 363a7e7dd4..b816bae658 100644
--- a/conftools/perllib/dnsconf/DNSConf-macros.h
+++ b/conftools/perllib/dnsconf/DNSConf-macros.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/conftools/perllib/dnsconf/DNSConf.i b/conftools/perllib/dnsconf/DNSConf.i
index dcb5ad5b1c..326448122b 100644
--- a/conftools/perllib/dnsconf/DNSConf.i
+++ b/conftools/perllib/dnsconf/DNSConf.i
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/conftools/perllib/dnsconf/Makefile.PL b/conftools/perllib/dnsconf/Makefile.PL
index a92a96cb7c..9833e589f0 100644
--- a/conftools/perllib/dnsconf/Makefile.PL
+++ b/conftools/perllib/dnsconf/Makefile.PL
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/conftools/perllib/dnsconf/named1.conf b/conftools/perllib/dnsconf/named1.conf
index 067c805639..ba0b465b88 100644
--- a/conftools/perllib/dnsconf/named1.conf
+++ b/conftools/perllib/dnsconf/named1.conf
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/conftools/perllib/dnsconf/test.pl b/conftools/perllib/dnsconf/test.pl
index c17e9a2bc0..8c2c6cdbd8 100644
--- a/conftools/perllib/dnsconf/test.pl
+++ b/conftools/perllib/dnsconf/test.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/named-bootconf/named-bootconf.sh b/contrib/named-bootconf/named-bootconf.sh
index 01efc9df29..ebfb277cfc 100644
--- a/contrib/named-bootconf/named-bootconf.sh
+++ b/contrib/named-bootconf/named-bootconf.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Portions Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/nanny/nanny.pl b/contrib/nanny/nanny.pl
index b295145430..f5227f477d 100644
--- a/contrib/nanny/nanny.pl
+++ b/contrib/nanny/nanny.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/dir/dirdb.c b/contrib/sdb/dir/dirdb.c
index b69965d635..b8220a8f32 100644
--- a/contrib/sdb/dir/dirdb.c
+++ b/contrib/sdb/dir/dirdb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/dir/dirdb.h b/contrib/sdb/dir/dirdb.h
index a9b563174f..68f17527e4 100644
--- a/contrib/sdb/dir/dirdb.h
+++ b/contrib/sdb/dir/dirdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
index 3bba50da8f..47378647d7 100644
--- a/contrib/sdb/pgsql/pgsqldb.c
+++ b/contrib/sdb/pgsql/pgsqldb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/pgsql/pgsqldb.h b/contrib/sdb/pgsql/pgsqldb.h
index 9000b3f1ee..375b053983 100644
--- a/contrib/sdb/pgsql/pgsqldb.h
+++ b/contrib/sdb/pgsql/pgsqldb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
index 3673abd34c..8cb4c46259 100644
--- a/contrib/sdb/pgsql/zonetodb.c
+++ b/contrib/sdb/pgsql/zonetodb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/tcl/lookup.tcl b/contrib/sdb/tcl/lookup.tcl
index e7b71867ba..d66bdb5f13 100644
--- a/contrib/sdb/tcl/lookup.tcl
+++ b/contrib/sdb/tcl/lookup.tcl
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/tcl/tcldb.c b/contrib/sdb/tcl/tcldb.c
index 4e45c381e6..a8159d21f6 100644
--- a/contrib/sdb/tcl/tcldb.c
+++ b/contrib/sdb/tcl/tcldb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/tcl/tcldb.h b/contrib/sdb/tcl/tcldb.h
index f066f2636c..1e2512ddd4 100644
--- a/contrib/sdb/tcl/tcldb.h
+++ b/contrib/sdb/tcl/tcldb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/time/timedb.c b/contrib/sdb/time/timedb.c
index 75aee4242a..472804829b 100644
--- a/contrib/sdb/time/timedb.c
+++ b/contrib/sdb/time/timedb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/contrib/sdb/time/timedb.h b/contrib/sdb/time/timedb.h
index 42aa9f06ff..690cbfc6a0 100644
--- a/contrib/sdb/time/timedb.h
+++ b/contrib/sdb/time/timedb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c377f6811e..9a988a1853 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 10e400b19b..9e719fa30f 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -21,6 +20,10 @@
     <title>BIND 9 Administrator Reference Manual</title>
     <!-- insert copyright start -->
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -38,13 +41,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
     <!-- insert copyright end -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="releaseinfo.xml"/>
   </info>
diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
index 79ab2b9956..f092741119 100644
--- a/doc/arm/Makefile.in
+++ b/doc/arm/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/arm/README-SGML b/doc/arm/README-SGML
index a285541b46..1f2a965356 100644
--- a/doc/arm/README-SGML
+++ b/doc/arm/README-SGML
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 The BIND v9 ARM master document is now kept in DocBook 5 XML format.
diff --git a/doc/design/addressdb b/doc/design/addressdb
index dc43ef8d06..fbc57530a4 100644
--- a/doc/design/addressdb
+++ b/doc/design/addressdb
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: addressdb,v 1.6 2004/03/05 05:04:45 marka Exp $
diff --git a/doc/design/cds-child b/doc/design/cds-child
index b9444d1172..034f25ea76 100644
--- a/doc/design/cds-child
+++ b/doc/design/cds-child
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 	  CDS / CDNSKEY Child side processing.
 
 * We need a mechanism to say that key should have a cds publish
diff --git a/doc/design/compression b/doc/design/compression
index 4adf092ab3..a299069c84 100644
--- a/doc/design/compression
+++ b/doc/design/compression
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Compression
diff --git a/doc/design/database b/doc/design/database
index 7c2621376b..a6f8995691 100644
--- a/doc/design/database
+++ b/doc/design/database
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: database,v 1.9 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/db_rules b/doc/design/db_rules
index 922043bbc5..b2410c58a4 100644
--- a/doc/design/db_rules
+++ b/doc/design/db_rules
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: db_rules,v 1.8 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/decompression b/doc/design/decompression
index f15cfb4abf..ab19cfe9ac 100644
--- a/doc/design/decompression
+++ b/doc/design/decompression
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Name Decompression
diff --git a/doc/design/dispatch b/doc/design/dispatch
index b029e21a83..20466fa6e8 100644
--- a/doc/design/dispatch
+++ b/doc/design/dispatch
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: dispatch,v 1.6 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/keydone b/doc/design/keydone
index f0e8d5b484..4ed65caf53 100644
--- a/doc/design/keydone
+++ b/doc/design/keydone
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id: keydone,v 1.2 2011/10/19 23:46:56 tbox Exp $
 
         rndc keydone <rdata> zone [class [view]]
diff --git a/doc/design/logging b/doc/design/logging
index c032397699..d175293942 100644
--- a/doc/design/logging
+++ b/doc/design/logging
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: logging,v 1.10 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/lwres b/doc/design/lwres
index 249d78da44..fe2bc31575 100644
--- a/doc/design/lwres
+++ b/doc/design/lwres
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: lwres,v 1.6 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/ncache b/doc/design/ncache
index a8d3e78ba5..717dd5e554 100644
--- a/doc/design/ncache
+++ b/doc/design/ncache
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: ncache,v 1.7 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/rdataset b/doc/design/rdataset
index 96226323a0..2a14f68b58 100644
--- a/doc/design/rdataset
+++ b/doc/design/rdataset
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: rdataset,v 1.6 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/red-black b/doc/design/red-black
index ce78cdcf68..242c3f67b9 100644
--- a/doc/design/red-black
+++ b/doc/design/red-black
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: red-black,v 1.9 2004/03/05 05:04:46 marka Exp $
diff --git a/doc/design/resolver b/doc/design/resolver
index 3fa25b4029..c3c3ae07c1 100644
--- a/doc/design/resolver
+++ b/doc/design/resolver
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: resolver,v 1.6 2004/03/05 05:04:47 marka Exp $
diff --git a/doc/design/search b/doc/design/search
index 0f71740229..ff14f89a04 100644
--- a/doc/design/search
+++ b/doc/design/search
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: search,v 1.10 2004/03/05 05:04:47 marka Exp $
diff --git a/doc/design/tasks b/doc/design/tasks
index 9d63d822f3..bc2c12db49 100644
--- a/doc/design/tasks
+++ b/doc/design/tasks
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: tasks,v 1.7 2004/03/05 05:04:47 marka Exp $
diff --git a/doc/design/verify b/doc/design/verify
index f24bbec0bc..adb3b87e95 100644
--- a/doc/design/verify
+++ b/doc/design/verify
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
 $Id$
 
 	dnssec-verify a tool to verify a zone is correctly signed.
diff --git a/doc/design/windows-nt b/doc/design/windows-nt
index 682d007874..46dcb66b88 100644
--- a/doc/design/windows-nt
+++ b/doc/design/windows-nt
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: windows-nt,v 1.8 2004/03/05 05:04:47 marka Exp $
diff --git a/doc/design/zone b/doc/design/zone
index 1adfc67fe5..5438fbb831 100644
--- a/doc/design/zone
+++ b/doc/design/zone
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 			Zones
diff --git a/doc/dev/DBC b/doc/dev/DBC
index ffb32d6bae..db0c71ed87 100644
--- a/doc/dev/DBC
+++ b/doc/dev/DBC
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: DBC,v 1.6 2004/03/05 05:04:49 marka Exp $
diff --git a/doc/dev/HOW-ADB-WORKS.txt b/doc/dev/HOW-ADB-WORKS.txt
index 1d2cab5772..b798606ab2 100644
--- a/doc/dev/HOW-ADB-WORKS.txt
+++ b/doc/dev/HOW-ADB-WORKS.txt
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: HOW-ADB-WORKS.txt,v 1.2 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/autoconf b/doc/dev/autoconf
index add8bf0b77..0109656e44 100644
--- a/doc/dev/autoconf
+++ b/doc/dev/autoconf
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: autoconf,v 1.4 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/coding.html b/doc/dev/coding.html
index 92958dc604..3fbda6bf21 100644
--- a/doc/dev/coding.html
+++ b/doc/dev/coding.html
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/dev/cvs-usage b/doc/dev/cvs-usage
index 94bdead134..090b6813cd 100644
--- a/doc/dev/cvs-usage
+++ b/doc/dev/cvs-usage
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Notes on CVS Usage
diff --git a/doc/dev/magic_numbers b/doc/dev/magic_numbers
index 045f859a5c..edbfd463f3 100644
--- a/doc/dev/magic_numbers
+++ b/doc/dev/magic_numbers
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: magic_numbers,v 1.7 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/rdata.md b/doc/dev/rdata.md
index 175b8f0da9..988e53395e 100644
--- a/doc/dev/rdata.md
+++ b/doc/dev/rdata.md
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/dev/release b/doc/dev/release
index 6da06ef149..ae4e6d550f 100644
--- a/doc/dev/release
+++ b/doc/dev/release
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: release,v 1.74 2009/08/06 23:47:44 tbox Exp $
diff --git a/doc/dev/results b/doc/dev/results
index ce86694d55..efd49bdd4b 100644
--- a/doc/dev/results
+++ b/doc/dev/results
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: results,v 1.7 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/tests b/doc/dev/tests
index 141d953a8d..38e281ae93 100644
--- a/doc/dev/tests
+++ b/doc/dev/tests
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: tests,v 1.15 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/dev/unexpected b/doc/dev/unexpected
index 363500bfc8..ff84ab41e7 100644
--- a/doc/dev/unexpected
+++ b/doc/dev/unexpected
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: unexpected,v 1.6 2004/03/05 05:04:50 marka Exp $
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 006283477c..91756cfd7b 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/misc/dnssec b/doc/misc/dnssec
index a133fe3034..9d9d5f146e 100644
--- a/doc/misc/dnssec
+++ b/doc/misc/dnssec
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 DNSSEC Release Notes
diff --git a/doc/misc/format-options.pl b/doc/misc/format-options.pl
index 3ae7f11e2a..a94897c881 100644
--- a/doc/misc/format-options.pl
+++ b/doc/misc/format-options.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/doc/misc/ipv6 b/doc/misc/ipv6
index 45d007ad6b..321dea9be7 100644
--- a/doc/misc/ipv6
+++ b/doc/misc/ipv6
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Currently, there are multiple interesting problems with ipv6
diff --git a/doc/misc/migration b/doc/misc/migration
index 19604ea8d8..baa1145199 100644
--- a/doc/misc/migration
+++ b/doc/misc/migration
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
                    BIND 8 to BIND 9 Migration Notes
diff --git a/doc/misc/migration-4to9 b/doc/misc/migration-4to9
index c5ed8e4e80..3c24f9b8a6 100644
--- a/doc/misc/migration-4to9
+++ b/doc/misc/migration-4to9
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: migration-4to9,v 1.4 2004/03/05 05:04:53 marka Exp $
diff --git a/doc/misc/rfc-compliance b/doc/misc/rfc-compliance
index 758950257d..253d595e63 100644
--- a/doc/misc/rfc-compliance
+++ b/doc/misc/rfc-compliance
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: rfc-compliance,v 1.4 2004/03/05 05:04:53 marka Exp $
diff --git a/doc/misc/roadmap b/doc/misc/roadmap
index 2bb8dc8d46..3ce9dbc654 100644
--- a/doc/misc/roadmap
+++ b/doc/misc/roadmap
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id: roadmap,v 1.2 2004/03/05 05:04:54 marka Exp $
diff --git a/doc/misc/sdb b/doc/misc/sdb
index f326fc9a69..422b83ff50 100644
--- a/doc/misc/sdb
+++ b/doc/misc/sdb
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 Using the BIND 9 Simplified Database Interface
diff --git a/isc-config.sh.in b/isc-config.sh.in
index 2a5486fdd5..f4523e1520 100644
--- a/isc-config.sh.in
+++ b/isc-config.sh.in
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 46c626f780..f0fb80b77b 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/Makefile.in b/lib/bind9/Makefile.in
index 3ddc1f3035..b036990a34 100644
--- a/lib/bind9/Makefile.in
+++ b/lib/bind9/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index ff28156882..f26f31626e 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index f1d3721f2b..606616fa0c 100644
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/include/Makefile.in b/lib/bind9/include/Makefile.in
index 400dfff5fc..cb9107b9a4 100644
--- a/lib/bind9/include/Makefile.in
+++ b/lib/bind9/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/include/bind9/Makefile.in b/lib/bind9/include/bind9/Makefile.in
index a629ecd445..1a0f11f8f8 100644
--- a/lib/bind9/include/bind9/Makefile.in
+++ b/lib/bind9/include/bind9/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/include/bind9/check.h b/lib/bind9/include/bind9/check.h
index 09310e6483..a601dd7db4 100644
--- a/lib/bind9/include/bind9/check.h
+++ b/lib/bind9/include/bind9/check.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/include/bind9/getaddresses.h b/lib/bind9/include/bind9/getaddresses.h
index f39fc268b9..458d885bfd 100644
--- a/lib/bind9/include/bind9/getaddresses.h
+++ b/lib/bind9/include/bind9/getaddresses.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/include/bind9/version.h b/lib/bind9/include/bind9/version.h
index e24cadfade..7a2398adbf 100644
--- a/lib/bind9/include/bind9/version.h
+++ b/lib/bind9/include/bind9/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/version.c b/lib/bind9/version.c
index 94067248e1..eb67c4ebaf 100644
--- a/lib/bind9/version.c
+++ b/lib/bind9/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/win32/DLLMain.c b/lib/bind9/win32/DLLMain.c
index fc9a6ffdb9..43887120ed 100644
--- a/lib/bind9/win32/DLLMain.c
+++ b/lib/bind9/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/bind9/win32/version.c b/lib/bind9/win32/version.c
index 2dc96e48cb..41ac983d45 100644
--- a/lib/bind9/win32/version.c
+++ b/lib/bind9/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 9bb2aeee73..2fb2010474 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/acl.c b/lib/dns/acl.c
index 805edf4041..855e30c049 100644
--- a/lib/dns/acl.c
+++ b/lib/dns/acl.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index d9d995312e..9519cc52f0 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/byaddr.c b/lib/dns/byaddr.c
index 91bcc3c73c..34d51da49d 100644
--- a/lib/dns/byaddr.c
+++ b/lib/dns/byaddr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/cache.c b/lib/dns/cache.c
index d77a693d0d..ad0505d04d 100644
--- a/lib/dns/cache.c
+++ b/lib/dns/cache.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/callbacks.c b/lib/dns/callbacks.c
index a19d00b4d3..1d147430fa 100644
--- a/lib/dns/callbacks.c
+++ b/lib/dns/callbacks.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/compress.c b/lib/dns/compress.c
index 25953ddfd7..20a26302fe 100644
--- a/lib/dns/compress.c
+++ b/lib/dns/compress.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/db.c b/lib/dns/db.c
index a05ca0dede..c80918dd3f 100644
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dbiterator.c b/lib/dns/dbiterator.c
index c7db28fa28..5124c0a3b5 100644
--- a/lib/dns/dbiterator.c
+++ b/lib/dns/dbiterator.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dbtable.c b/lib/dns/dbtable.c
index 8ec303c72c..32285fdf92 100644
--- a/lib/dns/dbtable.c
+++ b/lib/dns/dbtable.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/diff.c b/lib/dns/diff.c
index 00c0ff72ba..a613384c1e 100644
--- a/lib/dns/diff.c
+++ b/lib/dns/diff.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index fbd9852e41..ba93094f8b 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dlz.c b/lib/dns/dlz.c
index 029fbe093e..5dac1c3848 100644
--- a/lib/dns/dlz.c
+++ b/lib/dns/dlz.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dnssec.c b/lib/dns/dnssec.c
index d20903b6e0..32ecd168c5 100644
--- a/lib/dns/dnssec.c
+++ b/lib/dns/dnssec.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/ds.c b/lib/dns/ds.c
index e826c15e7b..6bc1f77beb 100644
--- a/lib/dns/ds.c
+++ b/lib/dns/ds.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_api.c b/lib/dns/dst_api.c
index 6d33d73c91..33db297c96 100644
--- a/lib/dns/dst_api.c
+++ b/lib/dns/dst_api.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_internal.h b/lib/dns/dst_internal.h
index 67e945cdd4..c6461a6f00 100644
--- a/lib/dns/dst_internal.h
+++ b/lib/dns/dst_internal.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2013, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2000-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_lib.c b/lib/dns/dst_lib.c
index 8ce84ee837..f2316fb66f 100644
--- a/lib/dns/dst_lib.c
+++ b/lib/dns/dst_lib.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_openssl.h b/lib/dns/dst_openssl.h
index c5679ce7bc..393700f4c7 100644
--- a/lib/dns/dst_openssl.h
+++ b/lib/dns/dst_openssl.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_parse.c b/lib/dns/dst_parse.c
index dd283ef291..69d6ce0146 100644
--- a/lib/dns/dst_parse.c
+++ b/lib/dns/dst_parse.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2013, 2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_parse.h b/lib/dns/dst_parse.h
index a247bef764..1b0129f9ba 100644
--- a/lib/dns/dst_parse.h
+++ b/lib/dns/dst_parse.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2010, 2012, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2000-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/dst_result.c b/lib/dns/dst_result.c
index 71083990de..3743362e80 100644
--- a/lib/dns/dst_result.c
+++ b/lib/dns/dst_result.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index ef8e78b027..1b9afcdeac 100644
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/gen-unix.h b/lib/dns/gen-unix.h
index 8dc722ba65..457ff51f5b 100644
--- a/lib/dns/gen-unix.h
+++ b/lib/dns/gen-unix.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h
index 20ac16d856..76515d6e97 100644
--- a/lib/dns/gen-win32.h
+++ b/lib/dns/gen-win32.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/gen.c b/lib/dns/gen.c
index 075657ab69..6a20a6ad7c 100644
--- a/lib/dns/gen.c
+++ b/lib/dns/gen.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/gssapi_link.c b/lib/dns/gssapi_link.c
index 764ba6cc93..abf9c35ae0 100644
--- a/lib/dns/gssapi_link.c
+++ b/lib/dns/gssapi_link.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/gssapictx.c b/lib/dns/gssapictx.c
index a245f07c0a..42aa903beb 100644
--- a/lib/dns/gssapictx.c
+++ b/lib/dns/gssapictx.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/hmac_link.c b/lib/dns/hmac_link.c
index f96a96b6bf..867e3dcb5a 100644
--- a/lib/dns/hmac_link.c
+++ b/lib/dns/hmac_link.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2015, 2017, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/Makefile.in b/lib/dns/include/Makefile.in
index e4220fe894..8f8fe697b6 100644
--- a/lib/dns/include/Makefile.in
+++ b/lib/dns/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/Makefile.in b/lib/dns/include/dns/Makefile.in
index 4bd7aeae1e..b2ed949058 100644
--- a/lib/dns/include/dns/Makefile.in
+++ b/lib/dns/include/dns/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/acl.h b/lib/dns/include/dns/acl.h
index f18203151e..da9898b330 100644
--- a/lib/dns/include/dns/acl.h
+++ b/lib/dns/include/dns/acl.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index cd0523a133..7aa1e67962 100644
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/bit.h b/lib/dns/include/dns/bit.h
index 28cd0f8d15..03ababec47 100644
--- a/lib/dns/include/dns/bit.h
+++ b/lib/dns/include/dns/bit.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/byaddr.h b/lib/dns/include/dns/byaddr.h
index e136ec7f68..f63692425e 100644
--- a/lib/dns/include/dns/byaddr.h
+++ b/lib/dns/include/dns/byaddr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/cache.h b/lib/dns/include/dns/cache.h
index 98401e2d20..395102583c 100644
--- a/lib/dns/include/dns/cache.h
+++ b/lib/dns/include/dns/cache.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/callbacks.h b/lib/dns/include/dns/callbacks.h
index ac53abbe32..ee187d481c 100644
--- a/lib/dns/include/dns/callbacks.h
+++ b/lib/dns/include/dns/callbacks.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/cert.h b/lib/dns/include/dns/cert.h
index f27abcf71c..4d065d13c5 100644
--- a/lib/dns/include/dns/cert.h
+++ b/lib/dns/include/dns/cert.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/compress.h b/lib/dns/include/dns/compress.h
index eca1567a58..02b45f7ea0 100644
--- a/lib/dns/include/dns/compress.h
+++ b/lib/dns/include/dns/compress.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 4e1ff5d858..4d0f94ce29 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/dbiterator.h b/lib/dns/include/dns/dbiterator.h
index 6075fdfe99..28d92d93d8 100644
--- a/lib/dns/include/dns/dbiterator.h
+++ b/lib/dns/include/dns/dbiterator.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/dbtable.h b/lib/dns/include/dns/dbtable.h
index bf6d338b78..a2b4090353 100644
--- a/lib/dns/include/dns/dbtable.h
+++ b/lib/dns/include/dns/dbtable.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/diff.h b/lib/dns/include/dns/diff.h
index 530c548acc..493883ac22 100644
--- a/lib/dns/include/dns/diff.h
+++ b/lib/dns/include/dns/diff.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 5952f95cd3..b06e748314 100644
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/dlz.h b/lib/dns/include/dns/dlz.h
index f59246f2dc..2f269a86ae 100644
--- a/lib/dns/include/dns/dlz.h
+++ b/lib/dns/include/dns/dlz.h
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/dnssec.h b/lib/dns/include/dns/dnssec.h
index 7e4ba4184e..a2d786d671 100644
--- a/lib/dns/include/dns/dnssec.h
+++ b/lib/dns/include/dns/dnssec.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/ds.h b/lib/dns/include/dns/ds.h
index 0e5f3a1191..4674722920 100644
--- a/lib/dns/include/dns/ds.h
+++ b/lib/dns/include/dns/ds.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/events.h b/lib/dns/include/dns/events.h
index 41d0ea732f..2fa30221d9 100644
--- a/lib/dns/include/dns/events.h
+++ b/lib/dns/include/dns/events.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/fixedname.h b/lib/dns/include/dns/fixedname.h
index 75f92be1b1..6578088f32 100644
--- a/lib/dns/include/dns/fixedname.h
+++ b/lib/dns/include/dns/fixedname.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index a48700d235..3113c2cafd 100644
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/journal.h b/lib/dns/include/dns/journal.h
index 9dc275c5ec..f7620b1eec 100644
--- a/lib/dns/include/dns/journal.h
+++ b/lib/dns/include/dns/journal.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/keyflags.h b/lib/dns/include/dns/keyflags.h
index 3548ff804c..cf05f0a41c 100644
--- a/lib/dns/include/dns/keyflags.h
+++ b/lib/dns/include/dns/keyflags.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index 8370a6b784..9763bed500 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/keyvalues.h b/lib/dns/include/dns/keyvalues.h
index d8b362f62a..e3199a6253 100644
--- a/lib/dns/include/dns/keyvalues.h
+++ b/lib/dns/include/dns/keyvalues.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/lib.h b/lib/dns/include/dns/lib.h
index 2e110920f2..19e327a8d1 100644
--- a/lib/dns/include/dns/lib.h
+++ b/lib/dns/include/dns/lib.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 285de6b86b..9539b3ab4a 100644
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/lookup.h b/lib/dns/include/dns/lookup.h
index 72b6873b80..344707bac6 100644
--- a/lib/dns/include/dns/lookup.h
+++ b/lib/dns/include/dns/lookup.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/master.h b/lib/dns/include/dns/master.h
index 6d0e4f8d61..13ae896de5 100644
--- a/lib/dns/include/dns/master.h
+++ b/lib/dns/include/dns/master.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h
index e3de31e5fc..09fdbcbe90 100644
--- a/lib/dns/include/dns/masterdump.h
+++ b/lib/dns/include/dns/masterdump.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 676d34f70c..60aae1a040 100644
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index e834bc630d..3159273081 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/ncache.h b/lib/dns/include/dns/ncache.h
index 6b226eb6f1..65c69dd421 100644
--- a/lib/dns/include/dns/ncache.h
+++ b/lib/dns/include/dns/ncache.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/nsec.h b/lib/dns/include/dns/nsec.h
index 24c91c9404..46474d19a2 100644
--- a/lib/dns/include/dns/nsec.h
+++ b/lib/dns/include/dns/nsec.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/opcode.h b/lib/dns/include/dns/opcode.h
index b487c89f32..3b341b45ab 100644
--- a/lib/dns/include/dns/opcode.h
+++ b/lib/dns/include/dns/opcode.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/order.h b/lib/dns/include/dns/order.h
index 87135c262f..7d3df18476 100644
--- a/lib/dns/include/dns/order.h
+++ b/lib/dns/include/dns/order.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/peer.h b/lib/dns/include/dns/peer.h
index 466f967ee2..0685647e8a 100644
--- a/lib/dns/include/dns/peer.h
+++ b/lib/dns/include/dns/peer.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/portlist.h b/lib/dns/include/dns/portlist.h
index dfa33f208c..cba46babd8 100644
--- a/lib/dns/include/dns/portlist.h
+++ b/lib/dns/include/dns/portlist.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index 08fe78bba4..d8c581dcf5 100644
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rcode.h b/lib/dns/include/dns/rcode.h
index 6b5a06f602..aec69a9e4e 100644
--- a/lib/dns/include/dns/rcode.h
+++ b/lib/dns/include/dns/rcode.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdata.h b/lib/dns/include/dns/rdata.h
index e83c33c5f6..aa11ade593 100644
--- a/lib/dns/include/dns/rdata.h
+++ b/lib/dns/include/dns/rdata.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdataclass.h b/lib/dns/include/dns/rdataclass.h
index b90b75106a..f80774dd8c 100644
--- a/lib/dns/include/dns/rdataclass.h
+++ b/lib/dns/include/dns/rdataclass.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdatalist.h b/lib/dns/include/dns/rdatalist.h
index 7fe96b54ef..d6ebf71ddd 100644
--- a/lib/dns/include/dns/rdatalist.h
+++ b/lib/dns/include/dns/rdatalist.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdataset.h b/lib/dns/include/dns/rdataset.h
index 710b870d36..8199435574 100644
--- a/lib/dns/include/dns/rdataset.h
+++ b/lib/dns/include/dns/rdataset.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdatasetiter.h b/lib/dns/include/dns/rdatasetiter.h
index 6742bdce2f..c08db3bbbb 100644
--- a/lib/dns/include/dns/rdatasetiter.h
+++ b/lib/dns/include/dns/rdatasetiter.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdataslab.h b/lib/dns/include/dns/rdataslab.h
index 1d2d2618b4..c18ba3af2a 100644
--- a/lib/dns/include/dns/rdataslab.h
+++ b/lib/dns/include/dns/rdataslab.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rdatatype.h b/lib/dns/include/dns/rdatatype.h
index 2986a193b9..d184a313c9 100644
--- a/lib/dns/include/dns/rdatatype.h
+++ b/lib/dns/include/dns/rdatatype.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 5678de2134..b67b549646 100644
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index d41af9a9cf..8870883af3 100644
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/result.h b/lib/dns/include/dns/result.h
index b5dd39195e..4c6c5d0ec9 100644
--- a/lib/dns/include/dns/result.h
+++ b/lib/dns/include/dns/result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/rootns.h b/lib/dns/include/dns/rootns.h
index 4cffe6ea0a..01691983a0 100644
--- a/lib/dns/include/dns/rootns.h
+++ b/lib/dns/include/dns/rootns.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/sdb.h b/lib/dns/include/dns/sdb.h
index cbbb89987b..7eb430ac28 100644
--- a/lib/dns/include/dns/sdb.h
+++ b/lib/dns/include/dns/sdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/sdlz.h b/lib/dns/include/dns/sdlz.h
index 0a2c4850c7..88f67f3c84 100644
--- a/lib/dns/include/dns/sdlz.h
+++ b/lib/dns/include/dns/sdlz.h
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/secalg.h b/lib/dns/include/dns/secalg.h
index 6e1030170a..6cc5d71f32 100644
--- a/lib/dns/include/dns/secalg.h
+++ b/lib/dns/include/dns/secalg.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/secproto.h b/lib/dns/include/dns/secproto.h
index ed5d424c9c..393a16c108 100644
--- a/lib/dns/include/dns/secproto.h
+++ b/lib/dns/include/dns/secproto.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/soa.h b/lib/dns/include/dns/soa.h
index 7aa9b1e969..b91f253e1f 100644
--- a/lib/dns/include/dns/soa.h
+++ b/lib/dns/include/dns/soa.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/ssu.h b/lib/dns/include/dns/ssu.h
index bebf5a910c..7fbb6c36a0 100644
--- a/lib/dns/include/dns/ssu.h
+++ b/lib/dns/include/dns/ssu.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h
index 3fbf0c7878..f908294a5b 100644
--- a/lib/dns/include/dns/stats.h
+++ b/lib/dns/include/dns/stats.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/tcpmsg.h b/lib/dns/include/dns/tcpmsg.h
index 8d13ce481a..e0a3ac2be5 100644
--- a/lib/dns/include/dns/tcpmsg.h
+++ b/lib/dns/include/dns/tcpmsg.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/time.h b/lib/dns/include/dns/time.h
index d3d8b3cce1..3a2197445a 100644
--- a/lib/dns/include/dns/time.h
+++ b/lib/dns/include/dns/time.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/timer.h b/lib/dns/include/dns/timer.h
index 954ccc10f8..8dbebb8554 100644
--- a/lib/dns/include/dns/timer.h
+++ b/lib/dns/include/dns/timer.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/tkey.h b/lib/dns/include/dns/tkey.h
index 41719caf38..5398869d7c 100644
--- a/lib/dns/include/dns/tkey.h
+++ b/lib/dns/include/dns/tkey.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index 2d6ce4d995..f4551b0f81 100644
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/ttl.h b/lib/dns/include/dns/ttl.h
index 8aa9341770..938acb1cfa 100644
--- a/lib/dns/include/dns/ttl.h
+++ b/lib/dns/include/dns/ttl.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 58a3acefbf..943ee8b973 100644
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/validator.h b/lib/dns/include/dns/validator.h
index 4edb1eafdb..38116e0ffb 100644
--- a/lib/dns/include/dns/validator.h
+++ b/lib/dns/include/dns/validator.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/version.h b/lib/dns/include/dns/version.h
index cd1ed595bb..ab2bc2d1c7 100644
--- a/lib/dns/include/dns/version.h
+++ b/lib/dns/include/dns/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 65ff0155d6..d4de397fc2 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index e359e84d80..367834c463 100644
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 2fd98775dd..b6594ce420 100644
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/zonekey.h b/lib/dns/include/dns/zonekey.h
index 175b71f1f1..e8eb7973e2 100644
--- a/lib/dns/include/dns/zonekey.h
+++ b/lib/dns/include/dns/zonekey.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dns/zt.h b/lib/dns/include/dns/zt.h
index 451b90b82a..ed0a00b957 100644
--- a/lib/dns/include/dns/zt.h
+++ b/lib/dns/include/dns/zt.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dst/Makefile.in b/lib/dns/include/dst/Makefile.in
index 8941ae026a..933f8ebd97 100644
--- a/lib/dns/include/dst/Makefile.in
+++ b/lib/dns/include/dst/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dst/dst.h b/lib/dns/include/dst/dst.h
index d5c4d5c419..a0fd38f4bf 100644
--- a/lib/dns/include/dst/dst.h
+++ b/lib/dns/include/dst/dst.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dst/gssapi.h b/lib/dns/include/dst/gssapi.h
index a6ed1c5d53..81946b0fb6 100644
--- a/lib/dns/include/dst/gssapi.h
+++ b/lib/dns/include/dst/gssapi.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dst/lib.h b/lib/dns/include/dst/lib.h
index 7841b34eef..1f52bd8687 100644
--- a/lib/dns/include/dst/lib.h
+++ b/lib/dns/include/dst/lib.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/include/dst/result.h b/lib/dns/include/dst/result.h
index 76351b3004..174d633252 100644
--- a/lib/dns/include/dst/result.h
+++ b/lib/dns/include/dst/result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 34233dbe04..da70007f9a 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/key.c b/lib/dns/key.c
index 4cb7257758..7f15250284 100644
--- a/lib/dns/key.c
+++ b/lib/dns/key.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index fbf8cff591..cec1debb90 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/lib.c b/lib/dns/lib.c
index c95cdbf84d..23762e0935 100644
--- a/lib/dns/lib.c
+++ b/lib/dns/lib.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/log.c b/lib/dns/log.c
index cf492e5143..9893ad9873 100644
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/lookup.c b/lib/dns/lookup.c
index 6be0aafd81..b7f4da8b06 100644
--- a/lib/dns/lookup.c
+++ b/lib/dns/lookup.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/master.c b/lib/dns/master.c
index 4964d5aedc..e8de7c2730 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index f0453cfd4c..28102cb3b3 100644
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/message.c b/lib/dns/message.c
index 721694a5c6..59ad1c2753 100644
--- a/lib/dns/message.c
+++ b/lib/dns/message.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 6fd4a1a8b2..9227aea0ff 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/ncache.c b/lib/dns/ncache.c
index c4a651c8c1..266895f92c 100644
--- a/lib/dns/ncache.c
+++ b/lib/dns/ncache.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/nsec.c b/lib/dns/nsec.c
index 69a18b47e1..be712602c1 100644
--- a/lib/dns/nsec.c
+++ b/lib/dns/nsec.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c
index 913668c4cc..cfe74beebc 100644
--- a/lib/dns/openssl_link.c
+++ b/lib/dns/openssl_link.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2012, 2014-2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
index 011d67cc55..d5b3e4e0f0 100644
--- a/lib/dns/openssldh_link.c
+++ b/lib/dns/openssldh_link.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009, 2011-2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
index 869004b338..d29e04742a 100644
--- a/lib/dns/openssldsa_link.c
+++ b/lib/dns/openssldsa_link.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2009, 2011-2013, 2015-2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1999-2002  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
index f9679e470a..bc2f8663c0 100644
--- a/lib/dns/opensslrsa_link.c
+++ b/lib/dns/opensslrsa_link.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/order.c b/lib/dns/order.c
index 71e9171cd3..7f1c9c70ca 100644
--- a/lib/dns/order.c
+++ b/lib/dns/order.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/peer.c b/lib/dns/peer.c
index 9dc280f976..aaaffbae1d 100644
--- a/lib/dns/peer.c
+++ b/lib/dns/peer.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/portlist.c b/lib/dns/portlist.c
index faa9988a47..b253f8cf6b 100644
--- a/lib/dns/portlist.c
+++ b/lib/dns/portlist.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
index 5a15edbc6b..7b3977cf76 100644
--- a/lib/dns/rbt.c
+++ b/lib/dns/rbt.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index b7b7564f49..9fa7b1f48b 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rbtdb.h b/lib/dns/rbtdb.h
index fdfb277589..d765cb8a30 100644
--- a/lib/dns/rbtdb.h
+++ b/lib/dns/rbtdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rbtdb64.c b/lib/dns/rbtdb64.c
index b9b8a6863d..9dbc0eda70 100644
--- a/lib/dns/rbtdb64.c
+++ b/lib/dns/rbtdb64.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rbtdb64.h b/lib/dns/rbtdb64.h
index ea1af49609..7485305928 100644
--- a/lib/dns/rbtdb64.h
+++ b/lib/dns/rbtdb64.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rcode.c b/lib/dns/rcode.c
index 5642867b36..e614afd1ff 100644
--- a/lib/dns/rcode.c
+++ b/lib/dns/rcode.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 5fa531466f..a28ed634bc 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c
index f4a26f409d..425f67377d 100644
--- a/lib/dns/rdata/any_255/tsig_250.c
+++ b/lib/dns/rdata/any_255/tsig_250.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/any_255/tsig_250.h b/lib/dns/rdata/any_255/tsig_250.h
index ec9b2a7ac0..4c174f36d5 100644
--- a/lib/dns/rdata/any_255/tsig_250.h
+++ b/lib/dns/rdata/any_255/tsig_250.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c
index 98b8f9508b..a2f47ab582 100644
--- a/lib/dns/rdata/generic/afsdb_18.c
+++ b/lib/dns/rdata/generic/afsdb_18.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/afsdb_18.h b/lib/dns/rdata/generic/afsdb_18.h
index 894436b989..dd38c24b2a 100644
--- a/lib/dns/rdata/generic/afsdb_18.h
+++ b/lib/dns/rdata/generic/afsdb_18.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c
index 99184dcb19..c4cc889e2a 100644
--- a/lib/dns/rdata/generic/cert_37.c
+++ b/lib/dns/rdata/generic/cert_37.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/cert_37.h b/lib/dns/rdata/generic/cert_37.h
index a936d8ced0..37a5360cd7 100644
--- a/lib/dns/rdata/generic/cert_37.h
+++ b/lib/dns/rdata/generic/cert_37.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c
index 80d982e9da..e2ff624a4b 100644
--- a/lib/dns/rdata/generic/cname_5.c
+++ b/lib/dns/rdata/generic/cname_5.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/cname_5.h b/lib/dns/rdata/generic/cname_5.h
index e910563a55..440b0679a8 100644
--- a/lib/dns/rdata/generic/cname_5.h
+++ b/lib/dns/rdata/generic/cname_5.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c
index 3b2bba0074..28e6c13817 100644
--- a/lib/dns/rdata/generic/dname_39.c
+++ b/lib/dns/rdata/generic/dname_39.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/dname_39.h b/lib/dns/rdata/generic/dname_39.h
index 447caf7e39..82f3f0b528 100644
--- a/lib/dns/rdata/generic/dname_39.h
+++ b/lib/dns/rdata/generic/dname_39.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/dnskey_48.c b/lib/dns/rdata/generic/dnskey_48.c
index ec3a6bdd83..bb599d5dcd 100644
--- a/lib/dns/rdata/generic/dnskey_48.c
+++ b/lib/dns/rdata/generic/dnskey_48.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/dnskey_48.h b/lib/dns/rdata/generic/dnskey_48.h
index 47814026e6..5e71254a3a 100644
--- a/lib/dns/rdata/generic/dnskey_48.h
+++ b/lib/dns/rdata/generic/dnskey_48.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ds_43.c b/lib/dns/rdata/generic/ds_43.c
index 4108703186..83f0b8757a 100644
--- a/lib/dns/rdata/generic/ds_43.c
+++ b/lib/dns/rdata/generic/ds_43.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ds_43.h b/lib/dns/rdata/generic/ds_43.h
index ecc14443a2..86934e727a 100644
--- a/lib/dns/rdata/generic/ds_43.h
+++ b/lib/dns/rdata/generic/ds_43.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c
index 36a2f59acb..ad02cbbc23 100644
--- a/lib/dns/rdata/generic/gpos_27.c
+++ b/lib/dns/rdata/generic/gpos_27.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/gpos_27.h b/lib/dns/rdata/generic/gpos_27.h
index 7cb791835b..66b933c2e1 100644
--- a/lib/dns/rdata/generic/gpos_27.h
+++ b/lib/dns/rdata/generic/gpos_27.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c
index a91f13d806..38657e1aec 100644
--- a/lib/dns/rdata/generic/hinfo_13.c
+++ b/lib/dns/rdata/generic/hinfo_13.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/hinfo_13.h b/lib/dns/rdata/generic/hinfo_13.h
index 8cf5e4855b..b39c76fff7 100644
--- a/lib/dns/rdata/generic/hinfo_13.h
+++ b/lib/dns/rdata/generic/hinfo_13.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c
index 60beff2e85..42853296e3 100644
--- a/lib/dns/rdata/generic/isdn_20.c
+++ b/lib/dns/rdata/generic/isdn_20.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/isdn_20.h b/lib/dns/rdata/generic/isdn_20.h
index 9259ef21ec..26acffe8ed 100644
--- a/lib/dns/rdata/generic/isdn_20.h
+++ b/lib/dns/rdata/generic/isdn_20.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c
index 19c894f1a5..934777f03e 100644
--- a/lib/dns/rdata/generic/key_25.c
+++ b/lib/dns/rdata/generic/key_25.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/key_25.h b/lib/dns/rdata/generic/key_25.h
index bc7a83c6c2..3973be60f6 100644
--- a/lib/dns/rdata/generic/key_25.h
+++ b/lib/dns/rdata/generic/key_25.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c
index fa79d2139a..ab7d54e5a1 100644
--- a/lib/dns/rdata/generic/loc_29.c
+++ b/lib/dns/rdata/generic/loc_29.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/loc_29.h b/lib/dns/rdata/generic/loc_29.h
index a711b284e4..9e1b30a256 100644
--- a/lib/dns/rdata/generic/loc_29.h
+++ b/lib/dns/rdata/generic/loc_29.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c
index 2025bac885..c7804b1fc8 100644
--- a/lib/dns/rdata/generic/mb_7.c
+++ b/lib/dns/rdata/generic/mb_7.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mb_7.h b/lib/dns/rdata/generic/mb_7.h
index a12c921de0..596301f8df 100644
--- a/lib/dns/rdata/generic/mb_7.h
+++ b/lib/dns/rdata/generic/mb_7.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c
index c7b65d2edd..00ea3dbc09 100644
--- a/lib/dns/rdata/generic/md_3.c
+++ b/lib/dns/rdata/generic/md_3.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/md_3.h b/lib/dns/rdata/generic/md_3.h
index 60c37bff65..d70e4a0482 100644
--- a/lib/dns/rdata/generic/md_3.h
+++ b/lib/dns/rdata/generic/md_3.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c
index f588d0aa6a..e6f762d128 100644
--- a/lib/dns/rdata/generic/mf_4.c
+++ b/lib/dns/rdata/generic/mf_4.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mf_4.h b/lib/dns/rdata/generic/mf_4.h
index 3526b534b9..b6e6e11242 100644
--- a/lib/dns/rdata/generic/mf_4.h
+++ b/lib/dns/rdata/generic/mf_4.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c
index cc720b9091..e0ada092b1 100644
--- a/lib/dns/rdata/generic/mg_8.c
+++ b/lib/dns/rdata/generic/mg_8.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mg_8.h b/lib/dns/rdata/generic/mg_8.h
index d5ecd039a9..174f8e433c 100644
--- a/lib/dns/rdata/generic/mg_8.h
+++ b/lib/dns/rdata/generic/mg_8.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c
index a2c19a3c1b..cf82abefb9 100644
--- a/lib/dns/rdata/generic/minfo_14.c
+++ b/lib/dns/rdata/generic/minfo_14.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/minfo_14.h b/lib/dns/rdata/generic/minfo_14.h
index 8e885b306a..10bdf95370 100644
--- a/lib/dns/rdata/generic/minfo_14.h
+++ b/lib/dns/rdata/generic/minfo_14.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c
index dba05144e6..3a4dea3249 100644
--- a/lib/dns/rdata/generic/mr_9.c
+++ b/lib/dns/rdata/generic/mr_9.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mr_9.h b/lib/dns/rdata/generic/mr_9.h
index 565a912675..7484e48e7a 100644
--- a/lib/dns/rdata/generic/mr_9.h
+++ b/lib/dns/rdata/generic/mr_9.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c
index a9bd587b5f..f87da90715 100644
--- a/lib/dns/rdata/generic/mx_15.c
+++ b/lib/dns/rdata/generic/mx_15.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/mx_15.h b/lib/dns/rdata/generic/mx_15.h
index a55cad0cd4..9a27347129 100644
--- a/lib/dns/rdata/generic/mx_15.h
+++ b/lib/dns/rdata/generic/mx_15.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/naptr_35.c b/lib/dns/rdata/generic/naptr_35.c
index 1f37ee4e71..1d7631ca4f 100644
--- a/lib/dns/rdata/generic/naptr_35.c
+++ b/lib/dns/rdata/generic/naptr_35.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/naptr_35.h b/lib/dns/rdata/generic/naptr_35.h
index 214a497383..559cc9f81d 100644
--- a/lib/dns/rdata/generic/naptr_35.h
+++ b/lib/dns/rdata/generic/naptr_35.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c
index fda2f36ec5..cdb3ecbbf7 100644
--- a/lib/dns/rdata/generic/ns_2.c
+++ b/lib/dns/rdata/generic/ns_2.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ns_2.h b/lib/dns/rdata/generic/ns_2.h
index afee4d5b7f..507995cf47 100644
--- a/lib/dns/rdata/generic/ns_2.h
+++ b/lib/dns/rdata/generic/ns_2.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/nsec_47.c b/lib/dns/rdata/generic/nsec_47.c
index d65c37e7cd..437c124659 100644
--- a/lib/dns/rdata/generic/nsec_47.c
+++ b/lib/dns/rdata/generic/nsec_47.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/nsec_47.h b/lib/dns/rdata/generic/nsec_47.h
index 5e9e41e0fc..15027944cf 100644
--- a/lib/dns/rdata/generic/nsec_47.h
+++ b/lib/dns/rdata/generic/nsec_47.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c
index e2f8a7758a..a18584e21a 100644
--- a/lib/dns/rdata/generic/null_10.c
+++ b/lib/dns/rdata/generic/null_10.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/null_10.h b/lib/dns/rdata/generic/null_10.h
index f98d4c8177..a1cd2ee239 100644
--- a/lib/dns/rdata/generic/null_10.h
+++ b/lib/dns/rdata/generic/null_10.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c
index ec279234c3..d5090bb3eb 100644
--- a/lib/dns/rdata/generic/nxt_30.c
+++ b/lib/dns/rdata/generic/nxt_30.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/nxt_30.h b/lib/dns/rdata/generic/nxt_30.h
index 6f6916e5da..efbc31e4a0 100644
--- a/lib/dns/rdata/generic/nxt_30.h
+++ b/lib/dns/rdata/generic/nxt_30.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 5ad52086af..979a87f7f1 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/opt_41.h b/lib/dns/rdata/generic/opt_41.h
index f2e5a2b09a..888b5a4c89 100644
--- a/lib/dns/rdata/generic/opt_41.h
+++ b/lib/dns/rdata/generic/opt_41.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/proforma.c b/lib/dns/rdata/generic/proforma.c
index ef408cd582..4fe1588931 100644
--- a/lib/dns/rdata/generic/proforma.c
+++ b/lib/dns/rdata/generic/proforma.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/proforma.h b/lib/dns/rdata/generic/proforma.h
index 2705f0c2b5..e7b95b166d 100644
--- a/lib/dns/rdata/generic/proforma.h
+++ b/lib/dns/rdata/generic/proforma.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c
index 5e87efb5ff..30768e4131 100644
--- a/lib/dns/rdata/generic/ptr_12.c
+++ b/lib/dns/rdata/generic/ptr_12.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/ptr_12.h b/lib/dns/rdata/generic/ptr_12.h
index 04a0fb97eb..f2c1c32367 100644
--- a/lib/dns/rdata/generic/ptr_12.h
+++ b/lib/dns/rdata/generic/ptr_12.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c
index ead5e6ec1c..4583104eae 100644
--- a/lib/dns/rdata/generic/rp_17.c
+++ b/lib/dns/rdata/generic/rp_17.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rp_17.h b/lib/dns/rdata/generic/rp_17.h
index 92b13eaf00..2b9475217b 100644
--- a/lib/dns/rdata/generic/rp_17.h
+++ b/lib/dns/rdata/generic/rp_17.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rrsig_46.c b/lib/dns/rdata/generic/rrsig_46.c
index 06ef8195d0..b791bc6bba 100644
--- a/lib/dns/rdata/generic/rrsig_46.c
+++ b/lib/dns/rdata/generic/rrsig_46.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rrsig_46.h b/lib/dns/rdata/generic/rrsig_46.h
index ccd06c047e..88da606771 100644
--- a/lib/dns/rdata/generic/rrsig_46.h
+++ b/lib/dns/rdata/generic/rrsig_46.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c
index 7fb019432f..222f9b3282 100644
--- a/lib/dns/rdata/generic/rt_21.c
+++ b/lib/dns/rdata/generic/rt_21.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/rt_21.h b/lib/dns/rdata/generic/rt_21.h
index 412ca4bb44..cc41b7e7e5 100644
--- a/lib/dns/rdata/generic/rt_21.h
+++ b/lib/dns/rdata/generic/rt_21.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c
index ac836a4316..987aac7327 100644
--- a/lib/dns/rdata/generic/sig_24.c
+++ b/lib/dns/rdata/generic/sig_24.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/sig_24.h b/lib/dns/rdata/generic/sig_24.h
index cf44f31725..72ec726ff8 100644
--- a/lib/dns/rdata/generic/sig_24.h
+++ b/lib/dns/rdata/generic/sig_24.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c
index d15f6e1a5d..4c02b9b15f 100644
--- a/lib/dns/rdata/generic/soa_6.c
+++ b/lib/dns/rdata/generic/soa_6.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/soa_6.h b/lib/dns/rdata/generic/soa_6.h
index 117b6bddc1..eb7e2e5b83 100644
--- a/lib/dns/rdata/generic/soa_6.h
+++ b/lib/dns/rdata/generic/soa_6.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/spf_99.c b/lib/dns/rdata/generic/spf_99.c
index 86cf82f058..b2da1a99fb 100644
--- a/lib/dns/rdata/generic/spf_99.c
+++ b/lib/dns/rdata/generic/spf_99.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/spf_99.h b/lib/dns/rdata/generic/spf_99.h
index fa6a53f8c0..cfd8995638 100644
--- a/lib/dns/rdata/generic/spf_99.h
+++ b/lib/dns/rdata/generic/spf_99.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/sshfp_44.c b/lib/dns/rdata/generic/sshfp_44.c
index 3d0199d838..e931918484 100644
--- a/lib/dns/rdata/generic/sshfp_44.c
+++ b/lib/dns/rdata/generic/sshfp_44.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/sshfp_44.h b/lib/dns/rdata/generic/sshfp_44.h
index a621c7016f..ce530ccd8f 100644
--- a/lib/dns/rdata/generic/sshfp_44.h
+++ b/lib/dns/rdata/generic/sshfp_44.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c
index b1baef513c..3a8ac9e031 100644
--- a/lib/dns/rdata/generic/tkey_249.c
+++ b/lib/dns/rdata/generic/tkey_249.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/tkey_249.h b/lib/dns/rdata/generic/tkey_249.h
index 4c8dbbff5a..4bfb98f6f7 100644
--- a/lib/dns/rdata/generic/tkey_249.h
+++ b/lib/dns/rdata/generic/tkey_249.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c
index c5b53257fc..11b811c3e6 100644
--- a/lib/dns/rdata/generic/txt_16.c
+++ b/lib/dns/rdata/generic/txt_16.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/txt_16.h b/lib/dns/rdata/generic/txt_16.h
index 16503d7b48..9bfda2fb6a 100644
--- a/lib/dns/rdata/generic/txt_16.h
+++ b/lib/dns/rdata/generic/txt_16.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c
index 25c348be87..a757832f29 100644
--- a/lib/dns/rdata/generic/unspec_103.c
+++ b/lib/dns/rdata/generic/unspec_103.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/unspec_103.h b/lib/dns/rdata/generic/unspec_103.h
index f8e3064475..293fc772f4 100644
--- a/lib/dns/rdata/generic/unspec_103.h
+++ b/lib/dns/rdata/generic/unspec_103.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c
index 1fa805677f..938445b63c 100644
--- a/lib/dns/rdata/generic/x25_19.c
+++ b/lib/dns/rdata/generic/x25_19.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/generic/x25_19.h b/lib/dns/rdata/generic/x25_19.h
index d994812e4a..f144066a62 100644
--- a/lib/dns/rdata/generic/x25_19.h
+++ b/lib/dns/rdata/generic/x25_19.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c
index a199f3ddcd..77d3f0014b 100644
--- a/lib/dns/rdata/hs_4/a_1.c
+++ b/lib/dns/rdata/hs_4/a_1.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/hs_4/a_1.h b/lib/dns/rdata/hs_4/a_1.h
index 51b62b2170..137ee07824 100644
--- a/lib/dns/rdata/hs_4/a_1.h
+++ b/lib/dns/rdata/hs_4/a_1.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c
index 24c6a43d50..164aa684a2 100644
--- a/lib/dns/rdata/in_1/a6_38.c
+++ b/lib/dns/rdata/in_1/a6_38.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/a6_38.h b/lib/dns/rdata/in_1/a6_38.h
index 185f6e1725..edc392227a 100644
--- a/lib/dns/rdata/in_1/a6_38.h
+++ b/lib/dns/rdata/in_1/a6_38.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c
index 06991a63ae..37eed10ba2 100644
--- a/lib/dns/rdata/in_1/a_1.c
+++ b/lib/dns/rdata/in_1/a_1.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/a_1.h b/lib/dns/rdata/in_1/a_1.h
index ff411e31d2..a41773ad3e 100644
--- a/lib/dns/rdata/in_1/a_1.h
+++ b/lib/dns/rdata/in_1/a_1.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c
index 7f8972eb9a..98630e288f 100644
--- a/lib/dns/rdata/in_1/aaaa_28.c
+++ b/lib/dns/rdata/in_1/aaaa_28.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/aaaa_28.h b/lib/dns/rdata/in_1/aaaa_28.h
index 34ebaabf38..87d5c3cdd2 100644
--- a/lib/dns/rdata/in_1/aaaa_28.h
+++ b/lib/dns/rdata/in_1/aaaa_28.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/apl_42.c b/lib/dns/rdata/in_1/apl_42.c
index fc6032859d..6d209431e5 100644
--- a/lib/dns/rdata/in_1/apl_42.c
+++ b/lib/dns/rdata/in_1/apl_42.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/apl_42.h b/lib/dns/rdata/in_1/apl_42.h
index 83267eb4aa..c50adb6094 100644
--- a/lib/dns/rdata/in_1/apl_42.h
+++ b/lib/dns/rdata/in_1/apl_42.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c
index f32159a9e5..dda5127035 100644
--- a/lib/dns/rdata/in_1/kx_36.c
+++ b/lib/dns/rdata/in_1/kx_36.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/kx_36.h b/lib/dns/rdata/in_1/kx_36.h
index 65792f71de..c9e77aa097 100644
--- a/lib/dns/rdata/in_1/kx_36.h
+++ b/lib/dns/rdata/in_1/kx_36.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c
index d5457380bd..c453323807 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.c
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.h b/lib/dns/rdata/in_1/nsap-ptr_23.h
index 1ff1061ec4..5a7659448a 100644
--- a/lib/dns/rdata/in_1/nsap-ptr_23.h
+++ b/lib/dns/rdata/in_1/nsap-ptr_23.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c
index df16ed49bf..c6ea961af2 100644
--- a/lib/dns/rdata/in_1/nsap_22.c
+++ b/lib/dns/rdata/in_1/nsap_22.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/nsap_22.h b/lib/dns/rdata/in_1/nsap_22.h
index 50794469c1..5312cd7329 100644
--- a/lib/dns/rdata/in_1/nsap_22.h
+++ b/lib/dns/rdata/in_1/nsap_22.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c
index bf261ff265..2dbb069fe4 100644
--- a/lib/dns/rdata/in_1/px_26.c
+++ b/lib/dns/rdata/in_1/px_26.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/px_26.h b/lib/dns/rdata/in_1/px_26.h
index 31de4b8b9a..9bf9b42950 100644
--- a/lib/dns/rdata/in_1/px_26.h
+++ b/lib/dns/rdata/in_1/px_26.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c
index 0e07bab48d..421d6f58f2 100644
--- a/lib/dns/rdata/in_1/srv_33.c
+++ b/lib/dns/rdata/in_1/srv_33.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/srv_33.h b/lib/dns/rdata/in_1/srv_33.h
index 208ae81ed8..c7fa9642d8 100644
--- a/lib/dns/rdata/in_1/srv_33.h
+++ b/lib/dns/rdata/in_1/srv_33.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index ee7c05f66c..9a7eead1f6 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/in_1/wks_11.h b/lib/dns/rdata/in_1/wks_11.h
index 5771abfe20..f854183fba 100644
--- a/lib/dns/rdata/in_1/wks_11.h
+++ b/lib/dns/rdata/in_1/wks_11.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/rdatastructpre.h b/lib/dns/rdata/rdatastructpre.h
index 9e3b6948f1..294dc7626f 100644
--- a/lib/dns/rdata/rdatastructpre.h
+++ b/lib/dns/rdata/rdatastructpre.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdata/rdatastructsuf.h b/lib/dns/rdata/rdatastructsuf.h
index 2c0a1236cb..8393007bc2 100644
--- a/lib/dns/rdata/rdatastructsuf.h
+++ b/lib/dns/rdata/rdatastructsuf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdatalist.c b/lib/dns/rdatalist.c
index a1b4ede76d..2ba6824c8d 100644
--- a/lib/dns/rdatalist.c
+++ b/lib/dns/rdatalist.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdatalist_p.h b/lib/dns/rdatalist_p.h
index cfd632ea32..42feff40cf 100644
--- a/lib/dns/rdatalist_p.h
+++ b/lib/dns/rdatalist_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdataset.c b/lib/dns/rdataset.c
index d0238228d9..19e8f9e811 100644
--- a/lib/dns/rdataset.c
+++ b/lib/dns/rdataset.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdatasetiter.c b/lib/dns/rdatasetiter.c
index a7894db140..1c9fe9b2f8 100644
--- a/lib/dns/rdatasetiter.c
+++ b/lib/dns/rdatasetiter.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rdataslab.c b/lib/dns/rdataslab.c
index c2ab2b4b73..f783e3797d 100644
--- a/lib/dns/rdataslab.c
+++ b/lib/dns/rdataslab.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/request.c b/lib/dns/request.c
index 57ff409782..d693bdd986 100644
--- a/lib/dns/request.c
+++ b/lib/dns/request.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 5764334535..252a02f904 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/result.c b/lib/dns/result.c
index 0fb524192b..851f196ba6 100644
--- a/lib/dns/result.c
+++ b/lib/dns/result.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
index 24c17dc8f4..1aeb74ae49 100644
--- a/lib/dns/rootns.c
+++ b/lib/dns/rootns.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 1c13f3d632..0a527e2546 100644
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index 49bb15997a..e0262da2d2 100644
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/soa.c b/lib/dns/soa.c
index 922c3706ca..f4dfcc1123 100644
--- a/lib/dns/soa.c
+++ b/lib/dns/soa.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/ssu.c b/lib/dns/ssu.c
index ebae756ad0..d4dd82cded 100644
--- a/lib/dns/ssu.c
+++ b/lib/dns/ssu.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/stats.c b/lib/dns/stats.c
index 84f12cc024..1204e04e73 100644
--- a/lib/dns/stats.c
+++ b/lib/dns/stats.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/tcpmsg.c b/lib/dns/tcpmsg.c
index de8a591a38..5085ed0a41 100644
--- a/lib/dns/tcpmsg.c
+++ b/lib/dns/tcpmsg.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/time.c b/lib/dns/time.c
index ad95691928..623ef02aad 100644
--- a/lib/dns/time.c
+++ b/lib/dns/time.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/timer.c b/lib/dns/timer.c
index 85029cd53a..5889ec40e3 100644
--- a/lib/dns/timer.c
+++ b/lib/dns/timer.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index cb94b15cc8..ca4a818e67 100644
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/tsig.c b/lib/dns/tsig.c
index 66976dc92c..02711cca88 100644
--- a/lib/dns/tsig.c
+++ b/lib/dns/tsig.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/ttl.c b/lib/dns/ttl.c
index ee27dd89e8..3ae75bc57e 100644
--- a/lib/dns/ttl.c
+++ b/lib/dns/ttl.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index bec13551f7..fe6d56213d 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/version.c b/lib/dns/version.c
index 1b474f951b..dfb9869da6 100644
--- a/lib/dns/version.c
+++ b/lib/dns/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 6155b03b99..762c968e51 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c
index a6a3644446..d713d00df5 100644
--- a/lib/dns/win32/DLLMain.c
+++ b/lib/dns/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c
index ce5935a0f8..3f52df9b2c 100644
--- a/lib/dns/win32/version.c
+++ b/lib/dns/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index bf4d814dac..008dab3408 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 49146f86ce..ddac489a7c 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/zonekey.c b/lib/dns/zonekey.c
index 4fb1e8bd76..698e3ca68d 100644
--- a/lib/dns/zonekey.c
+++ b/lib/dns/zonekey.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/dns/zt.c b/lib/dns/zt.c
index b88a74881c..95e337fa06 100644
--- a/lib/dns/zt.c
+++ b/lib/dns/zt.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 15c5515382..264e5acbc1 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c
index c269fe2e97..54f6308fd4 100644
--- a/lib/isc/assertions.c
+++ b/lib/isc/assertions.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/base64.c b/lib/isc/base64.c
index 60b8b3b935..6f1655ee16 100644
--- a/lib/isc/base64.c
+++ b/lib/isc/base64.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/bitstring.c b/lib/isc/bitstring.c
index 260f4aa9aa..9133a9e854 100644
--- a/lib/isc/bitstring.c
+++ b/lib/isc/bitstring.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c
index 313a009d34..6039f6883b 100644
--- a/lib/isc/buffer.c
+++ b/lib/isc/buffer.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/bufferlist.c b/lib/isc/bufferlist.c
index f87022e4bb..7f137fa4c7 100644
--- a/lib/isc/bufferlist.c
+++ b/lib/isc/bufferlist.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c
index cfd2aefdc5..36dcb05339 100644
--- a/lib/isc/commandline.c
+++ b/lib/isc/commandline.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/entropy.c b/lib/isc/entropy.c
index df8fcb2127..9f87541286 100644
--- a/lib/isc/entropy.c
+++ b/lib/isc/entropy.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/error.c b/lib/isc/error.c
index e41630f385..70f9560914 100644
--- a/lib/isc/error.c
+++ b/lib/isc/error.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/event.c b/lib/isc/event.c
index 399d9c2e74..d38bd7b137 100644
--- a/lib/isc/event.c
+++ b/lib/isc/event.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/fsaccess.c b/lib/isc/fsaccess.c
index 51de54a92c..cbba99a0d6 100644
--- a/lib/isc/fsaccess.c
+++ b/lib/isc/fsaccess.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/hash.c b/lib/isc/hash.c
index cc55dc5038..e95d58cb50 100644
--- a/lib/isc/hash.c
+++ b/lib/isc/hash.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/heap.c b/lib/isc/heap.c
index 668ff7d302..b6919eab4b 100644
--- a/lib/isc/heap.c
+++ b/lib/isc/heap.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/hex.c b/lib/isc/hex.c
index c709ff8676..2a224ebcf7 100644
--- a/lib/isc/hex.c
+++ b/lib/isc/hex.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/hmacmd5.c b/lib/isc/hmacmd5.c
index 0096ca24b4..d59aa19b6b 100644
--- a/lib/isc/hmacmd5.c
+++ b/lib/isc/hmacmd5.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/Makefile.in b/lib/isc/include/Makefile.in
index 36a1bc9c44..a9c10a26f5 100644
--- a/lib/isc/include/Makefile.in
+++ b/lib/isc/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in
index 5c878f59df..c32634f77e 100644
--- a/lib/isc/include/isc/Makefile.in
+++ b/lib/isc/include/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/app.h b/lib/isc/include/isc/app.h
index 41535970df..ec5bb93f80 100644
--- a/lib/isc/include/isc/app.h
+++ b/lib/isc/include/isc/app.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/assertions.h b/lib/isc/include/isc/assertions.h
index eec18ced21..967231384e 100644
--- a/lib/isc/include/isc/assertions.h
+++ b/lib/isc/include/isc/assertions.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/base64.h b/lib/isc/include/isc/base64.h
index a012bdcaaf..16f65a977c 100644
--- a/lib/isc/include/isc/base64.h
+++ b/lib/isc/include/isc/base64.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/bitstring.h b/lib/isc/include/isc/bitstring.h
index 17aa3a9c96..9452ab3665 100644
--- a/lib/isc/include/isc/bitstring.h
+++ b/lib/isc/include/isc/bitstring.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/boolean.h b/lib/isc/include/isc/boolean.h
index a408fdb217..c6bc003f43 100644
--- a/lib/isc/include/isc/boolean.h
+++ b/lib/isc/include/isc/boolean.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/buffer.h b/lib/isc/include/isc/buffer.h
index 73ed4cacf3..c72b6ccdb0 100644
--- a/lib/isc/include/isc/buffer.h
+++ b/lib/isc/include/isc/buffer.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/bufferlist.h b/lib/isc/include/isc/bufferlist.h
index 7f3db3e954..4a082747fb 100644
--- a/lib/isc/include/isc/bufferlist.h
+++ b/lib/isc/include/isc/bufferlist.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h
index f06145d484..7b621e685c 100644
--- a/lib/isc/include/isc/commandline.h
+++ b/lib/isc/include/isc/commandline.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/entropy.h b/lib/isc/include/isc/entropy.h
index 2f8e297ee0..3f33c4df1b 100644
--- a/lib/isc/include/isc/entropy.h
+++ b/lib/isc/include/isc/entropy.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/error.h b/lib/isc/include/isc/error.h
index 023b87b5b7..62d6404825 100644
--- a/lib/isc/include/isc/error.h
+++ b/lib/isc/include/isc/error.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/event.h b/lib/isc/include/isc/event.h
index e5decae568..6c38c630cb 100644
--- a/lib/isc/include/isc/event.h
+++ b/lib/isc/include/isc/event.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/eventclass.h b/lib/isc/include/isc/eventclass.h
index 538c802cd0..9b0f9e2791 100644
--- a/lib/isc/include/isc/eventclass.h
+++ b/lib/isc/include/isc/eventclass.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h
index 73d44fc841..65511aebf0 100644
--- a/lib/isc/include/isc/file.h
+++ b/lib/isc/include/isc/file.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/formatcheck.h b/lib/isc/include/isc/formatcheck.h
index 866575661d..29c73853aa 100644
--- a/lib/isc/include/isc/formatcheck.h
+++ b/lib/isc/include/isc/formatcheck.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/fsaccess.h b/lib/isc/include/isc/fsaccess.h
index b44156cd29..6ddaa7f2a2 100644
--- a/lib/isc/include/isc/fsaccess.h
+++ b/lib/isc/include/isc/fsaccess.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/hash.h b/lib/isc/include/isc/hash.h
index a0a3c7ace9..186d97c01f 100644
--- a/lib/isc/include/isc/hash.h
+++ b/lib/isc/include/isc/hash.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/heap.h b/lib/isc/include/isc/heap.h
index d5e9ed893f..713af785c9 100644
--- a/lib/isc/include/isc/heap.h
+++ b/lib/isc/include/isc/heap.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/hex.h b/lib/isc/include/isc/hex.h
index fa94efd85d..a9178f2d52 100644
--- a/lib/isc/include/isc/hex.h
+++ b/lib/isc/include/isc/hex.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/hmacmd5.h b/lib/isc/include/isc/hmacmd5.h
index a73889099a..967e86c5b1 100644
--- a/lib/isc/include/isc/hmacmd5.h
+++ b/lib/isc/include/isc/hmacmd5.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/interfaceiter.h b/lib/isc/include/isc/interfaceiter.h
index 3f957ad1df..2851e1dfcc 100644
--- a/lib/isc/include/isc/interfaceiter.h
+++ b/lib/isc/include/isc/interfaceiter.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/ipv6.h b/lib/isc/include/isc/ipv6.h
index cff0f7d52c..f3c5721090 100644
--- a/lib/isc/include/isc/ipv6.h
+++ b/lib/isc/include/isc/ipv6.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/lang.h b/lib/isc/include/isc/lang.h
index adb1a2e6b4..7b371e746c 100644
--- a/lib/isc/include/isc/lang.h
+++ b/lib/isc/include/isc/lang.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/lex.h b/lib/isc/include/isc/lex.h
index b58cd7dc1d..77440dbf84 100644
--- a/lib/isc/include/isc/lex.h
+++ b/lib/isc/include/isc/lex.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/lfsr.h b/lib/isc/include/isc/lfsr.h
index bd4f4e265e..e6639d43d3 100644
--- a/lib/isc/include/isc/lfsr.h
+++ b/lib/isc/include/isc/lfsr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/lib.h b/lib/isc/include/isc/lib.h
index 5a7143d3ba..6c9c18784a 100644
--- a/lib/isc/include/isc/lib.h
+++ b/lib/isc/include/isc/lib.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/list.h b/lib/isc/include/isc/list.h
index 74ca5ee6b8..ff30edc0c9 100644
--- a/lib/isc/include/isc/list.h
+++ b/lib/isc/include/isc/list.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/log.h b/lib/isc/include/isc/log.h
index f828049b26..81bc2d4d92 100644
--- a/lib/isc/include/isc/log.h
+++ b/lib/isc/include/isc/log.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/magic.h b/lib/isc/include/isc/magic.h
index 97a7ed5e9e..29ecd41600 100644
--- a/lib/isc/include/isc/magic.h
+++ b/lib/isc/include/isc/magic.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/md5.h b/lib/isc/include/isc/md5.h
index a12272754f..1f97e7d1b5 100644
--- a/lib/isc/include/isc/md5.h
+++ b/lib/isc/include/isc/md5.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/mem.h b/lib/isc/include/isc/mem.h
index 03cc4c4c10..29a8d5fbf7 100644
--- a/lib/isc/include/isc/mem.h
+++ b/lib/isc/include/isc/mem.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/msgcat.h b/lib/isc/include/isc/msgcat.h
index 9c9e583521..fbdeacdb62 100644
--- a/lib/isc/include/isc/msgcat.h
+++ b/lib/isc/include/isc/msgcat.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/msgs.h b/lib/isc/include/isc/msgs.h
index 94b198b1d0..37d6a8832b 100644
--- a/lib/isc/include/isc/msgs.h
+++ b/lib/isc/include/isc/msgs.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h
index 949b6d9bd5..c1d467c666 100644
--- a/lib/isc/include/isc/mutexblock.h
+++ b/lib/isc/include/isc/mutexblock.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/netaddr.h b/lib/isc/include/isc/netaddr.h
index 6a9ea74a88..a38d756c68 100644
--- a/lib/isc/include/isc/netaddr.h
+++ b/lib/isc/include/isc/netaddr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/netscope.h b/lib/isc/include/isc/netscope.h
index 272cfc0d12..a0596587bb 100644
--- a/lib/isc/include/isc/netscope.h
+++ b/lib/isc/include/isc/netscope.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/ondestroy.h b/lib/isc/include/isc/ondestroy.h
index 05acd5f065..0c243aeb06 100644
--- a/lib/isc/include/isc/ondestroy.h
+++ b/lib/isc/include/isc/ondestroy.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/os.h b/lib/isc/include/isc/os.h
index 427f1b2d98..a3aefce74f 100644
--- a/lib/isc/include/isc/os.h
+++ b/lib/isc/include/isc/os.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/parseint.h b/lib/isc/include/isc/parseint.h
index f2b4f66cac..ecd337a991 100644
--- a/lib/isc/include/isc/parseint.h
+++ b/lib/isc/include/isc/parseint.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 1a8711e05a..cc95f3fdf8 100644
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/print.h b/lib/isc/include/isc/print.h
index ccbb08d9a6..45d33ff7eb 100644
--- a/lib/isc/include/isc/print.h
+++ b/lib/isc/include/isc/print.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 59b8c497ac..87c2f0a97d 100644
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/random.h b/lib/isc/include/isc/random.h
index 5cd1dffb2a..21694e2f0d 100644
--- a/lib/isc/include/isc/random.h
+++ b/lib/isc/include/isc/random.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/ratelimiter.h b/lib/isc/include/isc/ratelimiter.h
index 82c43fdcc9..2c009c808a 100644
--- a/lib/isc/include/isc/ratelimiter.h
+++ b/lib/isc/include/isc/ratelimiter.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/refcount.h b/lib/isc/include/isc/refcount.h
index ad7e651ea9..2dc106f156 100644
--- a/lib/isc/include/isc/refcount.h
+++ b/lib/isc/include/isc/refcount.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/region.h b/lib/isc/include/isc/region.h
index 539bbd13c9..20596a3896 100644
--- a/lib/isc/include/isc/region.h
+++ b/lib/isc/include/isc/region.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/resource.h b/lib/isc/include/isc/resource.h
index 8d7eab834e..59504bc309 100644
--- a/lib/isc/include/isc/resource.h
+++ b/lib/isc/include/isc/resource.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/result.h b/lib/isc/include/isc/result.h
index cae0040418..b89b8c4372 100644
--- a/lib/isc/include/isc/result.h
+++ b/lib/isc/include/isc/result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/resultclass.h b/lib/isc/include/isc/resultclass.h
index 38ca6d80e9..1c01dd636b 100644
--- a/lib/isc/include/isc/resultclass.h
+++ b/lib/isc/include/isc/resultclass.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/rwlock.h b/lib/isc/include/isc/rwlock.h
index e22aabfed8..6de4a92efb 100644
--- a/lib/isc/include/isc/rwlock.h
+++ b/lib/isc/include/isc/rwlock.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/serial.h b/lib/isc/include/isc/serial.h
index b069f2630c..50623fdf83 100644
--- a/lib/isc/include/isc/serial.h
+++ b/lib/isc/include/isc/serial.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/sha1.h b/lib/isc/include/isc/sha1.h
index bf491e169a..04b2b1c18c 100644
--- a/lib/isc/include/isc/sha1.h
+++ b/lib/isc/include/isc/sha1.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/sockaddr.h b/lib/isc/include/isc/sockaddr.h
index 0d92b59558..4fac243392 100644
--- a/lib/isc/include/isc/sockaddr.h
+++ b/lib/isc/include/isc/sockaddr.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index fb5dd17c72..784073cf8d 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/stdio.h b/lib/isc/include/isc/stdio.h
index ab51771a48..a331a6d5e9 100644
--- a/lib/isc/include/isc/stdio.h
+++ b/lib/isc/include/isc/stdio.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/stdlib.h b/lib/isc/include/isc/stdlib.h
index 71f2ecd9a6..02f9c3d455 100644
--- a/lib/isc/include/isc/stdlib.h
+++ b/lib/isc/include/isc/stdlib.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/string.h b/lib/isc/include/isc/string.h
index 9805dc6a1d..8d2ab28408 100644
--- a/lib/isc/include/isc/string.h
+++ b/lib/isc/include/isc/string.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/symtab.h b/lib/isc/include/isc/symtab.h
index 2a0db5a785..838cd39665 100644
--- a/lib/isc/include/isc/symtab.h
+++ b/lib/isc/include/isc/symtab.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h
index 62081bef98..0d96a9b9bb 100644
--- a/lib/isc/include/isc/task.h
+++ b/lib/isc/include/isc/task.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/taskpool.h b/lib/isc/include/isc/taskpool.h
index 95a9313d28..8b11e6a1cf 100644
--- a/lib/isc/include/isc/taskpool.h
+++ b/lib/isc/include/isc/taskpool.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index bf2a766dc1..15ae98d663 100644
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/types.h b/lib/isc/include/isc/types.h
index 7132baebdc..1f3e0a17bc 100644
--- a/lib/isc/include/isc/types.h
+++ b/lib/isc/include/isc/types.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index 49d1f23d56..51d9cc1c05 100644
--- a/lib/isc/include/isc/util.h
+++ b/lib/isc/include/isc/util.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/include/isc/version.h b/lib/isc/include/isc/version.h
index c7156ecd8d..034e53fc7d 100644
--- a/lib/isc/include/isc/version.h
+++ b/lib/isc/include/isc/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/inet_aton.c b/lib/isc/inet_aton.c
index 349a36aacf..3c818f7a5a 100644
--- a/lib/isc/inet_aton.c
+++ b/lib/isc/inet_aton.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/inet_ntop.c b/lib/isc/inet_ntop.c
index e5e429c41a..a1170cc1ca 100644
--- a/lib/isc/inet_ntop.c
+++ b/lib/isc/inet_ntop.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c
index 8f17ecb2bb..2b1c174b59 100644
--- a/lib/isc/inet_pton.c
+++ b/lib/isc/inet_pton.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/lex.c b/lib/isc/lex.c
index a91ef418cb..860d5ab021 100644
--- a/lib/isc/lex.c
+++ b/lib/isc/lex.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/lfsr.c b/lib/isc/lfsr.c
index bedeea780c..7a112fce44 100644
--- a/lib/isc/lfsr.c
+++ b/lib/isc/lfsr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/lib.c b/lib/isc/lib.c
index edbd492165..081609a7e9 100644
--- a/lib/isc/lib.c
+++ b/lib/isc/lib.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/log.c b/lib/isc/log.c
index 228a290a46..8a4194a002 100644
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/md5.c b/lib/isc/md5.c
index d82253e91a..25624e0611 100644
--- a/lib/isc/md5.c
+++ b/lib/isc/md5.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/mem.c b/lib/isc/mem.c
index 68ac609f18..3d9b541c1d 100644
--- a/lib/isc/mem.c
+++ b/lib/isc/mem.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c
index 13052dd4e4..079d3eeabd 100644
--- a/lib/isc/mutexblock.c
+++ b/lib/isc/mutexblock.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c
index d5ded3c806..09442f4c39 100644
--- a/lib/isc/netaddr.c
+++ b/lib/isc/netaddr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/netscope.c b/lib/isc/netscope.c
index 3e3c6a542d..a80bea335f 100644
--- a/lib/isc/netscope.c
+++ b/lib/isc/netscope.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nls/Makefile.in b/lib/isc/nls/Makefile.in
index 52cd77077f..61d33a1001 100644
--- a/lib/isc/nls/Makefile.in
+++ b/lib/isc/nls/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nls/msgcat.c b/lib/isc/nls/msgcat.c
index 3595701c8e..98772a00e8 100644
--- a/lib/isc/nls/msgcat.c
+++ b/lib/isc/nls/msgcat.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/Makefile.in b/lib/isc/nothreads/Makefile.in
index c1893e6afb..ff879cf20c 100644
--- a/lib/isc/nothreads/Makefile.in
+++ b/lib/isc/nothreads/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/condition.c b/lib/isc/nothreads/condition.c
index 8513a389fa..618a16bb8c 100644
--- a/lib/isc/nothreads/condition.c
+++ b/lib/isc/nothreads/condition.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/Makefile.in b/lib/isc/nothreads/include/Makefile.in
index 58e6c01caf..fe17a5d58d 100644
--- a/lib/isc/nothreads/include/Makefile.in
+++ b/lib/isc/nothreads/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/isc/Makefile.in b/lib/isc/nothreads/include/isc/Makefile.in
index ee52dbc499..d70ec6738c 100644
--- a/lib/isc/nothreads/include/isc/Makefile.in
+++ b/lib/isc/nothreads/include/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/isc/condition.h b/lib/isc/nothreads/include/isc/condition.h
index 77e5301bc3..ad2d4e12f3 100644
--- a/lib/isc/nothreads/include/isc/condition.h
+++ b/lib/isc/nothreads/include/isc/condition.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/isc/mutex.h b/lib/isc/nothreads/include/isc/mutex.h
index b0162aa255..3729d5c252 100644
--- a/lib/isc/nothreads/include/isc/mutex.h
+++ b/lib/isc/nothreads/include/isc/mutex.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/isc/once.h b/lib/isc/nothreads/include/isc/once.h
index ebf3ea61d9..7d7d113fd3 100644
--- a/lib/isc/nothreads/include/isc/once.h
+++ b/lib/isc/nothreads/include/isc/once.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/include/isc/thread.h b/lib/isc/nothreads/include/isc/thread.h
index 3d23d7f108..612434dbff 100644
--- a/lib/isc/nothreads/include/isc/thread.h
+++ b/lib/isc/nothreads/include/isc/thread.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/mutex.c b/lib/isc/nothreads/mutex.c
index 742cd80f65..0ac83c8a4e 100644
--- a/lib/isc/nothreads/mutex.c
+++ b/lib/isc/nothreads/mutex.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/nothreads/thread.c b/lib/isc/nothreads/thread.c
index befe4aeb49..f4636f1137 100644
--- a/lib/isc/nothreads/thread.c
+++ b/lib/isc/nothreads/thread.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/ondestroy.c b/lib/isc/ondestroy.c
index ea4c168530..04c3d5eeb3 100644
--- a/lib/isc/ondestroy.c
+++ b/lib/isc/ondestroy.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/parseint.c b/lib/isc/parseint.c
index 758194ceea..c8a6b3a571 100644
--- a/lib/isc/parseint.c
+++ b/lib/isc/parseint.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/print.c b/lib/isc/print.c
index dda9c51069..d71ffa0955 100644
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/Makefile.in b/lib/isc/pthreads/Makefile.in
index 0a45526743..133076ce01 100644
--- a/lib/isc/pthreads/Makefile.in
+++ b/lib/isc/pthreads/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/condition.c b/lib/isc/pthreads/condition.c
index e4d41213c4..bc4b5245d8 100644
--- a/lib/isc/pthreads/condition.c
+++ b/lib/isc/pthreads/condition.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/Makefile.in b/lib/isc/pthreads/include/Makefile.in
index b58669524c..b9ca2576f7 100644
--- a/lib/isc/pthreads/include/Makefile.in
+++ b/lib/isc/pthreads/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/isc/Makefile.in b/lib/isc/pthreads/include/isc/Makefile.in
index 506ce150b2..c6b73d72d7 100644
--- a/lib/isc/pthreads/include/isc/Makefile.in
+++ b/lib/isc/pthreads/include/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/isc/condition.h b/lib/isc/pthreads/include/isc/condition.h
index 03a73473bc..63f4cb939f 100644
--- a/lib/isc/pthreads/include/isc/condition.h
+++ b/lib/isc/pthreads/include/isc/condition.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/isc/mutex.h b/lib/isc/pthreads/include/isc/mutex.h
index cbff7b10b2..a0c909df22 100644
--- a/lib/isc/pthreads/include/isc/mutex.h
+++ b/lib/isc/pthreads/include/isc/mutex.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/isc/once.h b/lib/isc/pthreads/include/isc/once.h
index 06861d0890..a4b5931c54 100644
--- a/lib/isc/pthreads/include/isc/once.h
+++ b/lib/isc/pthreads/include/isc/once.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/include/isc/thread.h b/lib/isc/pthreads/include/isc/thread.h
index 3b3c5d7330..2c85c0d8da 100644
--- a/lib/isc/pthreads/include/isc/thread.h
+++ b/lib/isc/pthreads/include/isc/thread.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/mutex.c b/lib/isc/pthreads/mutex.c
index 58759f513f..bb37c23501 100644
--- a/lib/isc/pthreads/mutex.c
+++ b/lib/isc/pthreads/mutex.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/pthreads/thread.c b/lib/isc/pthreads/thread.c
index 62c0fe69ab..c240aae1d9 100644
--- a/lib/isc/pthreads/thread.c
+++ b/lib/isc/pthreads/thread.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/quota.c b/lib/isc/quota.c
index 362bbc999e..96a792e187 100644
--- a/lib/isc/quota.c
+++ b/lib/isc/quota.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/random.c b/lib/isc/random.c
index 17533275c6..121b0011c0 100644
--- a/lib/isc/random.c
+++ b/lib/isc/random.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/ratelimiter.c b/lib/isc/ratelimiter.c
index e97a723488..f151f6af46 100644
--- a/lib/isc/ratelimiter.c
+++ b/lib/isc/ratelimiter.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/region.c b/lib/isc/region.c
index 079f2dfc3b..515a32d982 100644
--- a/lib/isc/region.c
+++ b/lib/isc/region.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/result.c b/lib/isc/result.c
index 72e303032a..9a9cf272e4 100644
--- a/lib/isc/result.c
+++ b/lib/isc/result.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/rwlock.c b/lib/isc/rwlock.c
index 6a73b04001..a27dfa8cce 100644
--- a/lib/isc/rwlock.c
+++ b/lib/isc/rwlock.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/serial.c b/lib/isc/serial.c
index 3b1db0d2b4..09958e2e60 100644
--- a/lib/isc/serial.c
+++ b/lib/isc/serial.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/sha1.c b/lib/isc/sha1.c
index e5e0f5b5a8..e9f03f1e29 100644
--- a/lib/isc/sha1.c
+++ b/lib/isc/sha1.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/sockaddr.c b/lib/isc/sockaddr.c
index f87a73cc95..4d7a315462 100644
--- a/lib/isc/sockaddr.c
+++ b/lib/isc/sockaddr.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 61164709aa..7d498cbe51 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/strtoul.c b/lib/isc/strtoul.c
index d7bafe56eb..ca94c29b1f 100644
--- a/lib/isc/strtoul.c
+++ b/lib/isc/strtoul.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/symtab.c b/lib/isc/symtab.c
index cfe6e9e50c..18b365207e 100644
--- a/lib/isc/symtab.c
+++ b/lib/isc/symtab.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/task.c b/lib/isc/task.c
index 218a054178..e9420f1df3 100644
--- a/lib/isc/task.c
+++ b/lib/isc/task.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/task_p.h b/lib/isc/task_p.h
index 9de6ff242e..d322aeb5f4 100644
--- a/lib/isc/task_p.h
+++ b/lib/isc/task_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/taskpool.c b/lib/isc/taskpool.c
index ff708b7a7c..3790f4fd6b 100644
--- a/lib/isc/taskpool.c
+++ b/lib/isc/taskpool.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index 67b8b59f8d..f7ad863f88 100644
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/timer_p.h b/lib/isc/timer_p.h
index c68253a0d2..2dfba4c92f 100644
--- a/lib/isc/timer_p.h
+++ b/lib/isc/timer_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/Makefile.in b/lib/isc/unix/Makefile.in
index e014249b57..5f949ce5b3 100644
--- a/lib/isc/unix/Makefile.in
+++ b/lib/isc/unix/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/app.c b/lib/isc/unix/app.c
index 1104f4a12f..fde5329813 100644
--- a/lib/isc/unix/app.c
+++ b/lib/isc/unix/app.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/dir.c b/lib/isc/unix/dir.c
index 035394727f..287aa70a39 100644
--- a/lib/isc/unix/dir.c
+++ b/lib/isc/unix/dir.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c
index 41df40d930..20704b5c99 100644
--- a/lib/isc/unix/entropy.c
+++ b/lib/isc/unix/entropy.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/errno2result.c b/lib/isc/unix/errno2result.c
index 8af633ebcb..4b5d5ca974 100644
--- a/lib/isc/unix/errno2result.c
+++ b/lib/isc/unix/errno2result.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/errno2result.h b/lib/isc/unix/errno2result.h
index 767599c7ba..9c9c00daca 100644
--- a/lib/isc/unix/errno2result.h
+++ b/lib/isc/unix/errno2result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c
index bfcac96c5c..80155ea6b9 100644
--- a/lib/isc/unix/file.c
+++ b/lib/isc/unix/file.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/fsaccess.c b/lib/isc/unix/fsaccess.c
index 3ebecaaed3..17434868ec 100644
--- a/lib/isc/unix/fsaccess.c
+++ b/lib/isc/unix/fsaccess.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/lib/isc/unix/ifiter_getifaddrs.c
index ca09b6840a..a10a2644bd 100644
--- a/lib/isc/unix/ifiter_getifaddrs.c
+++ b/lib/isc/unix/ifiter_getifaddrs.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 24d944373e..5c8f9b5e5e 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/ifiter_sysctl.c b/lib/isc/unix/ifiter_sysctl.c
index a0e1c260b8..22716648b1 100644
--- a/lib/isc/unix/ifiter_sysctl.c
+++ b/lib/isc/unix/ifiter_sysctl.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/Makefile.in b/lib/isc/unix/include/Makefile.in
index b58669524c..b9ca2576f7 100644
--- a/lib/isc/unix/include/Makefile.in
+++ b/lib/isc/unix/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/Makefile.in b/lib/isc/unix/include/isc/Makefile.in
index 6f9899d0a0..bac1fcdaa0 100644
--- a/lib/isc/unix/include/isc/Makefile.in
+++ b/lib/isc/unix/include/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/dir.h b/lib/isc/unix/include/isc/dir.h
index 9d96077eea..0750941110 100644
--- a/lib/isc/unix/include/isc/dir.h
+++ b/lib/isc/unix/include/isc/dir.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/int.h b/lib/isc/unix/include/isc/int.h
index d9c995ec83..1cd21591b4 100644
--- a/lib/isc/unix/include/isc/int.h
+++ b/lib/isc/unix/include/isc/int.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/keyboard.h b/lib/isc/unix/include/isc/keyboard.h
index db6962ad19..1b39f06000 100644
--- a/lib/isc/unix/include/isc/keyboard.h
+++ b/lib/isc/unix/include/isc/keyboard.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index d86b36cf7a..430e6a666e 100644
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/netdb.h b/lib/isc/unix/include/isc/netdb.h
index f2a7426215..abf135a47d 100644
--- a/lib/isc/unix/include/isc/netdb.h
+++ b/lib/isc/unix/include/isc/netdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/offset.h b/lib/isc/unix/include/isc/offset.h
index aaba7f5fe2..9739ffc8b2 100644
--- a/lib/isc/unix/include/isc/offset.h
+++ b/lib/isc/unix/include/isc/offset.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/stdtime.h b/lib/isc/unix/include/isc/stdtime.h
index 7b20c59993..6dda3d155c 100644
--- a/lib/isc/unix/include/isc/stdtime.h
+++ b/lib/isc/unix/include/isc/stdtime.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/strerror.h b/lib/isc/unix/include/isc/strerror.h
index bf4b46477b..08193c15e4 100644
--- a/lib/isc/unix/include/isc/strerror.h
+++ b/lib/isc/unix/include/isc/strerror.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/syslog.h b/lib/isc/unix/include/isc/syslog.h
index a180239007..652d1c74f5 100644
--- a/lib/isc/unix/include/isc/syslog.h
+++ b/lib/isc/unix/include/isc/syslog.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/include/isc/time.h b/lib/isc/unix/include/isc/time.h
index 62d842d806..9d3a4cdac1 100644
--- a/lib/isc/unix/include/isc/time.h
+++ b/lib/isc/unix/include/isc/time.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index 9506225c77..24b4eaa5a6 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/ipv6.c b/lib/isc/unix/ipv6.c
index a28c7f84b6..3ac3a0c46b 100644
--- a/lib/isc/unix/ipv6.c
+++ b/lib/isc/unix/ipv6.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/keyboard.c b/lib/isc/unix/keyboard.c
index b4da6e5cac..c89d561a02 100644
--- a/lib/isc/unix/keyboard.c
+++ b/lib/isc/unix/keyboard.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index ac44f44302..0ba9fef400 100644
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/os.c b/lib/isc/unix/os.c
index 16f07a0233..5c979a9fc9 100644
--- a/lib/isc/unix/os.c
+++ b/lib/isc/unix/os.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c
index 0bf1494f79..cd9d278c8e 100644
--- a/lib/isc/unix/resource.c
+++ b/lib/isc/unix/resource.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c
index c41360befa..8458cf4721 100644
--- a/lib/isc/unix/socket.c
+++ b/lib/isc/unix/socket.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/socket_p.h b/lib/isc/unix/socket_p.h
index 5141487aa1..601bde0b67 100644
--- a/lib/isc/unix/socket_p.h
+++ b/lib/isc/unix/socket_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/stdio.c b/lib/isc/unix/stdio.c
index ac54d926d4..369236bc2d 100644
--- a/lib/isc/unix/stdio.c
+++ b/lib/isc/unix/stdio.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/stdtime.c b/lib/isc/unix/stdtime.c
index 5b60a133f5..5996ad8310 100644
--- a/lib/isc/unix/stdtime.c
+++ b/lib/isc/unix/stdtime.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/strerror.c b/lib/isc/unix/strerror.c
index a698514104..7c698629c3 100644
--- a/lib/isc/unix/strerror.c
+++ b/lib/isc/unix/strerror.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/syslog.c b/lib/isc/unix/syslog.c
index e83a5bb8a7..27600f5188 100644
--- a/lib/isc/unix/syslog.c
+++ b/lib/isc/unix/syslog.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/unix/time.c b/lib/isc/unix/time.c
index 357d298244..58057973f1 100644
--- a/lib/isc/unix/time.c
+++ b/lib/isc/unix/time.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/version.c b/lib/isc/version.c
index a7389591fa..949569ac42 100644
--- a/lib/isc/version.c
+++ b/lib/isc/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c
index 1ab74ce916..097a9c35ec 100644
--- a/lib/isc/win32/DLLMain.c
+++ b/lib/isc/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/Makefile.in b/lib/isc/win32/Makefile.in
index 4b9d047a53..d63eb0673d 100644
--- a/lib/isc/win32/Makefile.in
+++ b/lib/isc/win32/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/app.c b/lib/isc/win32/app.c
index f24d1ac12d..5e06a7f7c6 100644
--- a/lib/isc/win32/app.c
+++ b/lib/isc/win32/app.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/condition.c b/lib/isc/win32/condition.c
index 88dfe2317f..f60d0e1992 100644
--- a/lib/isc/win32/condition.c
+++ b/lib/isc/win32/condition.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/dir.c b/lib/isc/win32/dir.c
index b76de7214c..8d640f9b8d 100644
--- a/lib/isc/win32/dir.c
+++ b/lib/isc/win32/dir.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/entropy.c b/lib/isc/win32/entropy.c
index 8af7cda35e..22f04f9e8a 100644
--- a/lib/isc/win32/entropy.c
+++ b/lib/isc/win32/entropy.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c
index b451ebaca4..317eb46a87 100644
--- a/lib/isc/win32/errno2result.c
+++ b/lib/isc/win32/errno2result.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/errno2result.h b/lib/isc/win32/errno2result.h
index 7f6813c380..eff79b7e20 100644
--- a/lib/isc/win32/errno2result.h
+++ b/lib/isc/win32/errno2result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c
index 03474e8284..7f474ec8e3 100644
--- a/lib/isc/win32/file.c
+++ b/lib/isc/win32/file.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c
index 64cd53bc00..cb5986753a 100644
--- a/lib/isc/win32/fsaccess.c
+++ b/lib/isc/win32/fsaccess.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/Makefile.in b/lib/isc/win32/include/Makefile.in
index 4254a40f1d..4e0bef06e1 100644
--- a/lib/isc/win32/include/Makefile.in
+++ b/lib/isc/win32/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/Makefile.in b/lib/isc/win32/include/isc/Makefile.in
index 07ad164e24..ca4847a3cd 100644
--- a/lib/isc/win32/include/isc/Makefile.in
+++ b/lib/isc/win32/include/isc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/bind_registry.h b/lib/isc/win32/include/isc/bind_registry.h
index fda3721ff5..841c595465 100644
--- a/lib/isc/win32/include/isc/bind_registry.h
+++ b/lib/isc/win32/include/isc/bind_registry.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/bindevt.h b/lib/isc/win32/include/isc/bindevt.h
index 2c4c82d187..2954fae515 100644
--- a/lib/isc/win32/include/isc/bindevt.h
+++ b/lib/isc/win32/include/isc/bindevt.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/condition.h b/lib/isc/win32/include/isc/condition.h
index ed2065ae12..bcdf95038b 100644
--- a/lib/isc/win32/include/isc/condition.h
+++ b/lib/isc/win32/include/isc/condition.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/dir.h b/lib/isc/win32/include/isc/dir.h
index 30cf72b400..25f3742c00 100644
--- a/lib/isc/win32/include/isc/dir.h
+++ b/lib/isc/win32/include/isc/dir.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/int.h b/lib/isc/win32/include/isc/int.h
index 4681fc65c3..9e8dba596a 100644
--- a/lib/isc/win32/include/isc/int.h
+++ b/lib/isc/win32/include/isc/int.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h
index 72b1c5176f..315d410e00 100644
--- a/lib/isc/win32/include/isc/ipv6.h
+++ b/lib/isc/win32/include/isc/ipv6.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/keyboard.h b/lib/isc/win32/include/isc/keyboard.h
index 68f4de6a13..2b51cb6029 100644
--- a/lib/isc/win32/include/isc/keyboard.h
+++ b/lib/isc/win32/include/isc/keyboard.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/mutex.h b/lib/isc/win32/include/isc/mutex.h
index 1ad4efb5f3..32fa022b8d 100644
--- a/lib/isc/win32/include/isc/mutex.h
+++ b/lib/isc/win32/include/isc/mutex.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h
index fbf064a9c0..db71619d70 100644
--- a/lib/isc/win32/include/isc/net.h
+++ b/lib/isc/win32/include/isc/net.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/netdb.h b/lib/isc/win32/include/isc/netdb.h
index 0cbecd94e4..f45000f4fb 100644
--- a/lib/isc/win32/include/isc/netdb.h
+++ b/lib/isc/win32/include/isc/netdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/ntgroups.h b/lib/isc/win32/include/isc/ntgroups.h
index 6a413c9a4f..f5615fd6d0 100644
--- a/lib/isc/win32/include/isc/ntgroups.h
+++ b/lib/isc/win32/include/isc/ntgroups.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/ntpaths.h b/lib/isc/win32/include/isc/ntpaths.h
index 23d5367355..0ff93b3fd9 100644
--- a/lib/isc/win32/include/isc/ntpaths.h
+++ b/lib/isc/win32/include/isc/ntpaths.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/offset.h b/lib/isc/win32/include/isc/offset.h
index cb671959ca..f6cc59a45b 100644
--- a/lib/isc/win32/include/isc/offset.h
+++ b/lib/isc/win32/include/isc/offset.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/once.h b/lib/isc/win32/include/isc/once.h
index 269abf43a2..36021059d8 100644
--- a/lib/isc/win32/include/isc/once.h
+++ b/lib/isc/win32/include/isc/once.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/platform.h.in b/lib/isc/win32/include/isc/platform.h.in
index 681ab8bed1..d410caf5c7 100644
--- a/lib/isc/win32/include/isc/platform.h.in
+++ b/lib/isc/win32/include/isc/platform.h.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h
index a1114cee87..e2276b814c 100644
--- a/lib/isc/win32/include/isc/stat.h
+++ b/lib/isc/win32/include/isc/stat.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/stdtime.h b/lib/isc/win32/include/isc/stdtime.h
index 1963c11fed..c41df8a86d 100644
--- a/lib/isc/win32/include/isc/stdtime.h
+++ b/lib/isc/win32/include/isc/stdtime.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/strerror.h b/lib/isc/win32/include/isc/strerror.h
index d37d8e8c28..e9b6258f63 100644
--- a/lib/isc/win32/include/isc/strerror.h
+++ b/lib/isc/win32/include/isc/strerror.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/syslog.h b/lib/isc/win32/include/isc/syslog.h
index fc3836dfde..7874100d8c 100644
--- a/lib/isc/win32/include/isc/syslog.h
+++ b/lib/isc/win32/include/isc/syslog.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/thread.h b/lib/isc/win32/include/isc/thread.h
index 4f6c7f2fc8..1554816270 100644
--- a/lib/isc/win32/include/isc/thread.h
+++ b/lib/isc/win32/include/isc/thread.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/time.h b/lib/isc/win32/include/isc/time.h
index 823c84fa56..cd9bbf6028 100644
--- a/lib/isc/win32/include/isc/time.h
+++ b/lib/isc/win32/include/isc/time.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/include/isc/win32os.h b/lib/isc/win32/include/isc/win32os.h
index 47af5d8855..37b1fda77f 100644
--- a/lib/isc/win32/include/isc/win32os.h
+++ b/lib/isc/win32/include/isc/win32os.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c
index 9059d2a566..2f2be6a868 100644
--- a/lib/isc/win32/interfaceiter.c
+++ b/lib/isc/win32/interfaceiter.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/ipv6.c b/lib/isc/win32/ipv6.c
index a35aee9567..bfb716eba6 100644
--- a/lib/isc/win32/ipv6.c
+++ b/lib/isc/win32/ipv6.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/keyboard.c b/lib/isc/win32/keyboard.c
index 7d7eff7990..b82d75a23e 100644
--- a/lib/isc/win32/keyboard.c
+++ b/lib/isc/win32/keyboard.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 7c39c96bda..3017e68ea3 100644
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/netdb.h b/lib/isc/win32/netdb.h
index 174f988ffa..6cd3e6de2b 100644
--- a/lib/isc/win32/netdb.h
+++ b/lib/isc/win32/netdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/ntgroups.c b/lib/isc/win32/ntgroups.c
index 578b8994d8..052c70bc61 100644
--- a/lib/isc/win32/ntgroups.c
+++ b/lib/isc/win32/ntgroups.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/ntpaths.c b/lib/isc/win32/ntpaths.c
index 42cad2cecc..45b222e4a8 100644
--- a/lib/isc/win32/ntpaths.c
+++ b/lib/isc/win32/ntpaths.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/once.c b/lib/isc/win32/once.c
index dfbd002d4d..2759f3e773 100644
--- a/lib/isc/win32/once.c
+++ b/lib/isc/win32/once.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c
index 19d8eae82b..9a5e019741 100644
--- a/lib/isc/win32/os.c
+++ b/lib/isc/win32/os.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/resource.c b/lib/isc/win32/resource.c
index 7764e7d62c..459fbe37cb 100644
--- a/lib/isc/win32/resource.c
+++ b/lib/isc/win32/resource.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 85de0de964..8264084dc2 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c
index f13ebf0968..d3148e89d1 100644
--- a/lib/isc/win32/stdio.c
+++ b/lib/isc/win32/stdio.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/stdtime.c b/lib/isc/win32/stdtime.c
index 8ee1a14e5a..82db39ee86 100644
--- a/lib/isc/win32/stdtime.c
+++ b/lib/isc/win32/stdtime.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/strerror.c b/lib/isc/win32/strerror.c
index f8dd4c0a5a..3e42462716 100644
--- a/lib/isc/win32/strerror.c
+++ b/lib/isc/win32/strerror.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/syslog.c b/lib/isc/win32/syslog.c
index a04b9d7235..88694dd0cf 100644
--- a/lib/isc/win32/syslog.c
+++ b/lib/isc/win32/syslog.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/syslog.h b/lib/isc/win32/syslog.h
index 9db51ac63a..fa851aa06f 100644
--- a/lib/isc/win32/syslog.h
+++ b/lib/isc/win32/syslog.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/thread.c b/lib/isc/win32/thread.c
index 87098920c9..106ba4993b 100644
--- a/lib/isc/win32/thread.c
+++ b/lib/isc/win32/thread.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/time.c b/lib/isc/win32/time.c
index b1efd5f01b..d73b882e4a 100644
--- a/lib/isc/win32/time.c
+++ b/lib/isc/win32/time.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/unistd.h b/lib/isc/win32/unistd.h
index 9dcc2a29d1..3155813a7b 100644
--- a/lib/isc/win32/unistd.h
+++ b/lib/isc/win32/unistd.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/version.c b/lib/isc/win32/version.c
index 9111aaebdc..559c90b9a7 100644
--- a/lib/isc/win32/version.c
+++ b/lib/isc/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isc/win32/win32os.c b/lib/isc/win32/win32os.c
index 2ef8f9c3d1..89983de269 100644
--- a/lib/isc/win32/win32os.c
+++ b/lib/isc/win32/win32os.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/Makefile.in b/lib/isccc/Makefile.in
index ed52c60df4..b9da5c1f25 100644
--- a/lib/isccc/Makefile.in
+++ b/lib/isccc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/alist.c b/lib/isccc/alist.c
index 330f8ae95b..6cd2902efd 100644
--- a/lib/isccc/alist.c
+++ b/lib/isccc/alist.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/base64.c b/lib/isccc/base64.c
index aeae04eb5c..98bb96a3c0 100644
--- a/lib/isccc/base64.c
+++ b/lib/isccc/base64.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2013, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/cc.c b/lib/isccc/cc.c
index 0fc7cfee90..fb7efdaf6e 100644
--- a/lib/isccc/cc.c
+++ b/lib/isccc/cc.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2012, 2013, 2015, 2016, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001-2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/ccmsg.c b/lib/isccc/ccmsg.c
index e825d4d1cc..0255002a08 100644
--- a/lib/isccc/ccmsg.c
+++ b/lib/isccc/ccmsg.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/Makefile.in b/lib/isccc/include/Makefile.in
index 88fa99959c..a939782c9b 100644
--- a/lib/isccc/include/Makefile.in
+++ b/lib/isccc/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/Makefile.in b/lib/isccc/include/isccc/Makefile.in
index b754049752..3116eac89e 100644
--- a/lib/isccc/include/isccc/Makefile.in
+++ b/lib/isccc/include/isccc/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/alist.h b/lib/isccc/include/isccc/alist.h
index f4d6e7f0d4..744af4d32a 100644
--- a/lib/isccc/include/isccc/alist.h
+++ b/lib/isccc/include/isccc/alist.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/base64.h b/lib/isccc/include/isccc/base64.h
index ee07666d92..08547b2238 100644
--- a/lib/isccc/include/isccc/base64.h
+++ b/lib/isccc/include/isccc/base64.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/cc.h b/lib/isccc/include/isccc/cc.h
index c962776cbd..35427f0799 100644
--- a/lib/isccc/include/isccc/cc.h
+++ b/lib/isccc/include/isccc/cc.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/ccmsg.h b/lib/isccc/include/isccc/ccmsg.h
index 7a5dcf7221..a14c334252 100644
--- a/lib/isccc/include/isccc/ccmsg.h
+++ b/lib/isccc/include/isccc/ccmsg.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/events.h b/lib/isccc/include/isccc/events.h
index 2c972747ee..caec73d09a 100644
--- a/lib/isccc/include/isccc/events.h
+++ b/lib/isccc/include/isccc/events.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/lib.h b/lib/isccc/include/isccc/lib.h
index 88c6a0cf3d..1121c7997e 100644
--- a/lib/isccc/include/isccc/lib.h
+++ b/lib/isccc/include/isccc/lib.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/result.h b/lib/isccc/include/isccc/result.h
index 0411dd81b8..680fac4ed7 100644
--- a/lib/isccc/include/isccc/result.h
+++ b/lib/isccc/include/isccc/result.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/sexpr.h b/lib/isccc/include/isccc/sexpr.h
index 4ee12d7bcd..698c091d19 100644
--- a/lib/isccc/include/isccc/sexpr.h
+++ b/lib/isccc/include/isccc/sexpr.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/symtab.h b/lib/isccc/include/isccc/symtab.h
index 2bc74b7eda..ab9edcf920 100644
--- a/lib/isccc/include/isccc/symtab.h
+++ b/lib/isccc/include/isccc/symtab.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/symtype.h b/lib/isccc/include/isccc/symtype.h
index ed81e11f22..41b0a4365d 100644
--- a/lib/isccc/include/isccc/symtype.h
+++ b/lib/isccc/include/isccc/symtype.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/types.h b/lib/isccc/include/isccc/types.h
index 17cdfdfe35..5cd58cabe2 100644
--- a/lib/isccc/include/isccc/types.h
+++ b/lib/isccc/include/isccc/types.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/util.h b/lib/isccc/include/isccc/util.h
index 6eca45e308..2a3373819c 100644
--- a/lib/isccc/include/isccc/util.h
+++ b/lib/isccc/include/isccc/util.h
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004-2007, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/include/isccc/version.h b/lib/isccc/include/isccc/version.h
index b32f0a0384..17c784062d 100644
--- a/lib/isccc/include/isccc/version.h
+++ b/lib/isccc/include/isccc/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/lib.c b/lib/isccc/lib.c
index 2a106a2178..c0fac7792c 100644
--- a/lib/isccc/lib.c
+++ b/lib/isccc/lib.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/result.c b/lib/isccc/result.c
index 2b42d3652d..6bb88be322 100644
--- a/lib/isccc/result.c
+++ b/lib/isccc/result.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001, 2003  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/sexpr.c b/lib/isccc/sexpr.c
index 391c46150b..064ab0dff9 100644
--- a/lib/isccc/sexpr.c
+++ b/lib/isccc/sexpr.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2014, 2015, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/symtab.c b/lib/isccc/symtab.c
index e58512c4c0..57314eed4f 100644
--- a/lib/isccc/symtab.c
+++ b/lib/isccc/symtab.c
@@ -1,6 +1,5 @@
 /*
- * Portions Copyright (C) 2004, 2005, 2007, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 2001  Internet Software Consortium.
+ * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/version.c b/lib/isccc/version.c
index 78da66e593..9d93a05698 100644
--- a/lib/isccc/version.c
+++ b/lib/isccc/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c
index f7f096166a..c9f7fe52ff 100644
--- a/lib/isccc/win32/DLLMain.c
+++ b/lib/isccc/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c
index a0acfa0b44..48a2d29803 100644
--- a/lib/isccc/win32/version.c
+++ b/lib/isccc/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/Makefile.in b/lib/isccfg/Makefile.in
index 0f81e82812..58d0505006 100644
--- a/lib/isccfg/Makefile.in
+++ b/lib/isccfg/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/aclconf.c b/lib/isccfg/aclconf.c
index 2f6579d73e..72e0b063bd 100644
--- a/lib/isccfg/aclconf.c
+++ b/lib/isccfg/aclconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/Makefile.in b/lib/isccfg/include/Makefile.in
index c48d3d4ca5..7cf0ab68d2 100644
--- a/lib/isccfg/include/Makefile.in
+++ b/lib/isccfg/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/Makefile.in b/lib/isccfg/include/isccfg/Makefile.in
index 0e2adcb078..035b9ea1c9 100644
--- a/lib/isccfg/include/isccfg/Makefile.in
+++ b/lib/isccfg/include/isccfg/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/aclconf.h b/lib/isccfg/include/isccfg/aclconf.h
index fdc48f4507..56003cbadb 100644
--- a/lib/isccfg/include/isccfg/aclconf.h
+++ b/lib/isccfg/include/isccfg/aclconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/cfg.h b/lib/isccfg/include/isccfg/cfg.h
index 5dc661e878..849ab4a23c 100644
--- a/lib/isccfg/include/isccfg/cfg.h
+++ b/lib/isccfg/include/isccfg/cfg.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 15fa4e261b..38ac4bbe44 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/log.h b/lib/isccfg/include/isccfg/log.h
index 07051876b0..83a06c51d9 100644
--- a/lib/isccfg/include/isccfg/log.h
+++ b/lib/isccfg/include/isccfg/log.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/namedconf.h b/lib/isccfg/include/isccfg/namedconf.h
index 0d77925b29..5b3c72346c 100644
--- a/lib/isccfg/include/isccfg/namedconf.h
+++ b/lib/isccfg/include/isccfg/namedconf.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/include/isccfg/version.h b/lib/isccfg/include/isccfg/version.h
index 319492f5e9..ee8e68da0a 100644
--- a/lib/isccfg/include/isccfg/version.h
+++ b/lib/isccfg/include/isccfg/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/log.c b/lib/isccfg/log.c
index 1490aa8d4e..9f6e1deda7 100644
--- a/lib/isccfg/log.c
+++ b/lib/isccfg/log.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index de5e77e508..dc5ede9a3b 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index e3f313e019..32ed52105f 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/version.c b/lib/isccfg/version.c
index d83f7ce421..c8e9e6ef95 100644
--- a/lib/isccfg/version.c
+++ b/lib/isccfg/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c
index 47beee870d..5512b1e09c 100644
--- a/lib/isccfg/win32/DLLMain.c
+++ b/lib/isccfg/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c
index 3485d0ae1b..063b5af70e 100644
--- a/lib/isccfg/win32/version.c
+++ b/lib/isccfg/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/Makefile.in b/lib/lwres/Makefile.in
index 61bac87ab7..6c8812cf56 100644
--- a/lib/lwres/Makefile.in
+++ b/lib/lwres/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/assert_p.h b/lib/lwres/assert_p.h
index 8f366c631b..f67aff9ed7 100644
--- a/lib/lwres/assert_p.h
+++ b/lib/lwres/assert_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/compat.c b/lib/lwres/compat.c
index 699fe50b95..e12ea77f43 100644
--- a/lib/lwres/compat.c
+++ b/lib/lwres/compat.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index cdd6d8cc54..d5ee8d3fc6 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/context_p.h b/lib/lwres/context_p.h
index c3e79ab09c..0479661c90 100644
--- a/lib/lwres/context_p.h
+++ b/lib/lwres/context_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/gai_strerror.c b/lib/lwres/gai_strerror.c
index 8b1a9bdbfd..545cd2c1c9 100644
--- a/lib/lwres/gai_strerror.c
+++ b/lib/lwres/gai_strerror.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/getaddrinfo.c b/lib/lwres/getaddrinfo.c
index c55b7638ca..7c841f3779 100644
--- a/lib/lwres/getaddrinfo.c
+++ b/lib/lwres/getaddrinfo.c
@@ -1,6 +1,8 @@
 /*
- * Copyright (C) 2004-2008, 2012, 2014, 2018  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001  Internet Software Consortium.
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
  *
  * See the COPYRIGHT file distributed with this work for additional
  * information regarding copyright ownership.
diff --git a/lib/lwres/gethost.c b/lib/lwres/gethost.c
index d92828bb3f..b4d27f2a2d 100644
--- a/lib/lwres/gethost.c
+++ b/lib/lwres/gethost.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/getipnode.c b/lib/lwres/getipnode.c
index 0bdc295360..cb6bef6801 100644
--- a/lib/lwres/getipnode.c
+++ b/lib/lwres/getipnode.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/getnameinfo.c b/lib/lwres/getnameinfo.c
index 2ecfa003a8..c3a933f3dc 100644
--- a/lib/lwres/getnameinfo.c
+++ b/lib/lwres/getnameinfo.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/getrrset.c b/lib/lwres/getrrset.c
index 47f1edcee6..810ad536c9 100644
--- a/lib/lwres/getrrset.c
+++ b/lib/lwres/getrrset.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/herror.c b/lib/lwres/herror.c
index 3fcdc6a83c..1b915d4340 100644
--- a/lib/lwres/herror.c
+++ b/lib/lwres/herror.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/Makefile.in b/lib/lwres/include/Makefile.in
index 37ec0254c1..7772f4da03 100644
--- a/lib/lwres/include/Makefile.in
+++ b/lib/lwres/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in
index f314a8601d..f5c3b8eb07 100644
--- a/lib/lwres/include/lwres/Makefile.in
+++ b/lib/lwres/include/lwres/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/context.h b/lib/lwres/include/lwres/context.h
index 9b6941c519..4bc79a2fb4 100644
--- a/lib/lwres/include/lwres/context.h
+++ b/lib/lwres/include/lwres/context.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/int.h b/lib/lwres/include/lwres/int.h
index 3952880079..a207c77e4f 100644
--- a/lib/lwres/include/lwres/int.h
+++ b/lib/lwres/include/lwres/int.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/ipv6.h b/lib/lwres/include/lwres/ipv6.h
index 03c42f98b0..d5eb975612 100644
--- a/lib/lwres/include/lwres/ipv6.h
+++ b/lib/lwres/include/lwres/ipv6.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/lang.h b/lib/lwres/include/lwres/lang.h
index 5bc0d406e0..b1101faec1 100644
--- a/lib/lwres/include/lwres/lang.h
+++ b/lib/lwres/include/lwres/lang.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/list.h b/lib/lwres/include/lwres/list.h
index d237d5b075..8efa7f21fb 100644
--- a/lib/lwres/include/lwres/list.h
+++ b/lib/lwres/include/lwres/list.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/lwbuffer.h b/lib/lwres/include/lwres/lwbuffer.h
index e8dffc4391..079f823cc5 100644
--- a/lib/lwres/include/lwres/lwbuffer.h
+++ b/lib/lwres/include/lwres/lwbuffer.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/lwpacket.h b/lib/lwres/include/lwres/lwpacket.h
index 450ebcf83e..37e69b8434 100644
--- a/lib/lwres/include/lwres/lwpacket.h
+++ b/lib/lwres/include/lwres/lwpacket.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/lwres.h b/lib/lwres/include/lwres/lwres.h
index e57dbaad2d..e5f2b59382 100644
--- a/lib/lwres/include/lwres/lwres.h
+++ b/lib/lwres/include/lwres/lwres.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/netdb.h.in b/lib/lwres/include/lwres/netdb.h.in
index f7d40cbe83..67189c9815 100644
--- a/lib/lwres/include/lwres/netdb.h.in
+++ b/lib/lwres/include/lwres/netdb.h.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/platform.h.in b/lib/lwres/include/lwres/platform.h.in
index 8017f5620e..fc57d808ee 100644
--- a/lib/lwres/include/lwres/platform.h.in
+++ b/lib/lwres/include/lwres/platform.h.in
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/result.h b/lib/lwres/include/lwres/result.h
index 7582ac788c..5fa74ca654 100644
--- a/lib/lwres/include/lwres/result.h
+++ b/lib/lwres/include/lwres/result.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/stdlib.h b/lib/lwres/include/lwres/stdlib.h
index c50f979876..6bb3f8312d 100644
--- a/lib/lwres/include/lwres/stdlib.h
+++ b/lib/lwres/include/lwres/stdlib.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/include/lwres/version.h b/lib/lwres/include/lwres/version.h
index 1469d39eb7..b8e25fed7e 100644
--- a/lib/lwres/include/lwres/version.h
+++ b/lib/lwres/include/lwres/version.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwbuffer.c b/lib/lwres/lwbuffer.c
index 62350b98a2..3307291f61 100644
--- a/lib/lwres/lwbuffer.c
+++ b/lib/lwres/lwbuffer.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwconfig.c b/lib/lwres/lwconfig.c
index 66dc0a40db..7f9c85e6a7 100644
--- a/lib/lwres/lwconfig.c
+++ b/lib/lwres/lwconfig.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwinetaton.c b/lib/lwres/lwinetaton.c
index 286457b5a3..dab4d5a785 100644
--- a/lib/lwres/lwinetaton.c
+++ b/lib/lwres/lwinetaton.c
@@ -1,6 +1,5 @@
 /*
  * Portions Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwinetntop.c b/lib/lwres/lwinetntop.c
index 8adfd24a9d..0258ae73be 100644
--- a/lib/lwres/lwinetntop.c
+++ b/lib/lwres/lwinetntop.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwinetpton.c b/lib/lwres/lwinetpton.c
index 1ef3888580..bb5e7da689 100644
--- a/lib/lwres/lwinetpton.c
+++ b/lib/lwres/lwinetpton.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwpacket.c b/lib/lwres/lwpacket.c
index ae42b816dc..ec7046e2df 100644
--- a/lib/lwres/lwpacket.c
+++ b/lib/lwres/lwpacket.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwres_gabn.c b/lib/lwres/lwres_gabn.c
index 8751affb22..2c50e2e746 100644
--- a/lib/lwres/lwres_gabn.c
+++ b/lib/lwres/lwres_gabn.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwres_gnba.c b/lib/lwres/lwres_gnba.c
index 3fae006ae5..9a84b4150e 100644
--- a/lib/lwres/lwres_gnba.c
+++ b/lib/lwres/lwres_gnba.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwres_grbn.c b/lib/lwres/lwres_grbn.c
index 6200448a8c..b0417e4c6d 100644
--- a/lib/lwres/lwres_grbn.c
+++ b/lib/lwres/lwres_grbn.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwres_noop.c b/lib/lwres/lwres_noop.c
index 314813caba..018112077a 100644
--- a/lib/lwres/lwres_noop.c
+++ b/lib/lwres/lwres_noop.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/lwresutil.c b/lib/lwres/lwresutil.c
index 522997f16c..4521f44537 100644
--- a/lib/lwres/lwresutil.c
+++ b/lib/lwres/lwresutil.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/man/Makefile.in b/lib/lwres/man/Makefile.in
index 38725f04ae..28f227e7f3 100644
--- a/lib/lwres/man/Makefile.in
+++ b/lib/lwres/man/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/man/lwres.docbook b/lib/lwres/man/lwres.docbook
index 6dd0fba6af..4b95a6c34e 100644
--- a/lib/lwres/man/lwres.docbook
+++ b/lib/lwres/man/lwres.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -37,6 +36,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -46,11 +47,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refsynopsisdiv>
diff --git a/lib/lwres/man/lwres_buffer.docbook b/lib/lwres/man/lwres_buffer.docbook
index 833ca47ac0..66512cbd2b 100644
--- a/lib/lwres/man/lwres_buffer.docbook
+++ b/lib/lwres/man/lwres_buffer.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_config.docbook b/lib/lwres/man/lwres_config.docbook
index 67f2e7cea5..a6c641c673 100644
--- a/lib/lwres/man/lwres_config.docbook
+++ b/lib/lwres/man/lwres_config.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_context.docbook b/lib/lwres/man/lwres_context.docbook
index e74abfeb44..28cb760c35 100644
--- a/lib/lwres/man/lwres_context.docbook
+++ b/lib/lwres/man/lwres_context.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,12 +46,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_gabn.docbook b/lib/lwres/man/lwres_gabn.docbook
index a3988cd0aa..256ea37150 100644
--- a/lib/lwres/man/lwres_gabn.docbook
+++ b/lib/lwres/man/lwres_gabn.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,11 +45,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_gai_strerror.docbook b/lib/lwres/man/lwres_gai_strerror.docbook
index 1fe49499ed..619825d2e2 100644
--- a/lib/lwres/man/lwres_gai_strerror.docbook
+++ b/lib/lwres/man/lwres_gai_strerror.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_getaddrinfo.docbook b/lib/lwres/man/lwres_getaddrinfo.docbook
index e3c129dc40..af36b9f074 100644
--- a/lib/lwres/man/lwres_getaddrinfo.docbook
+++ b/lib/lwres/man/lwres_getaddrinfo.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,12 +46,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_gethostent.docbook b/lib/lwres/man/lwres_gethostent.docbook
index 456ae1ecf6..63535c8a09 100644
--- a/lib/lwres/man/lwres_gethostent.docbook
+++ b/lib/lwres/man/lwres_gethostent.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,7 @@
 
   <docinfo>
     <copyright>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,10 +44,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook
index 66d3e6fa01..8952fc227c 100644
--- a/lib/lwres/man/lwres_getipnode.docbook
+++ b/lib/lwres/man/lwres_getipnode.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,9 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,12 +44,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_getnameinfo.docbook b/lib/lwres/man/lwres_getnameinfo.docbook
index 69f00349cf..b046d1f7d1 100644
--- a/lib/lwres/man/lwres_getnameinfo.docbook
+++ b/lib/lwres/man/lwres_getnameinfo.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_getrrsetbyname.docbook b/lib/lwres/man/lwres_getrrsetbyname.docbook
index 2616cf7bfd..cfcd6cfa16 100644
--- a/lib/lwres/man/lwres_getrrsetbyname.docbook
+++ b/lib/lwres/man/lwres_getrrsetbyname.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_gnba.docbook b/lib/lwres/man/lwres_gnba.docbook
index 1e60180f0a..fac98b4416 100644
--- a/lib/lwres/man/lwres_gnba.docbook
+++ b/lib/lwres/man/lwres_gnba.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,11 +45,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_hstrerror.docbook b/lib/lwres/man/lwres_hstrerror.docbook
index 16a1a3f0d4..a54aa53e23 100644
--- a/lib/lwres/man/lwres_hstrerror.docbook
+++ b/lib/lwres/man/lwres_hstrerror.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_inetntop.docbook b/lib/lwres/man/lwres_inetntop.docbook
index 99b84d2849..43eb887cc9 100644
--- a/lib/lwres/man/lwres_inetntop.docbook
+++ b/lib/lwres/man/lwres_inetntop.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,11 +45,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_noop.docbook b/lib/lwres/man/lwres_noop.docbook
index be392d39f8..16efbb9467 100644
--- a/lib/lwres/man/lwres_noop.docbook
+++ b/lib/lwres/man/lwres_noop.docbook
@@ -2,7 +2,6 @@
 <!ENTITY mdash "&#8212;">]>
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -35,6 +34,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -44,11 +45,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_packet.docbook b/lib/lwres/man/lwres_packet.docbook
index 6db3aeb73d..f59cecd12c 100644
--- a/lib/lwres/man/lwres_packet.docbook
+++ b/lib/lwres/man/lwres_packet.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/lwres_resutil.docbook b/lib/lwres/man/lwres_resutil.docbook
index 9b521f0831..e640add7c9 100644
--- a/lib/lwres/man/lwres_resutil.docbook
+++ b/lib/lwres/man/lwres_resutil.docbook
@@ -1,6 +1,5 @@
 <!--
  - Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) Internet Software Consortium.
  -
  - Permission to use, copy, modify, and/or distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -33,6 +32,8 @@
 
   <docinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
       <year>2004</year>
       <year>2005</year>
       <year>2007</year>
@@ -42,11 +43,6 @@
       <year>2018</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
   </docinfo>
 
   <refnamediv>
diff --git a/lib/lwres/man/resolver.5 b/lib/lwres/man/resolver.5
index daa7e05584..e941384f59 100644
--- a/lib/lwres/man/resolver.5
+++ b/lib/lwres/man/resolver.5
@@ -1,5 +1,4 @@
 .\" Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) Internet Software Consortium.
 .\"
 .\" Permission to use, copy, modify, and/or distribute this software for any
 .\" purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index efda8205da..da0ff92569 100644
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/print_p.h b/lib/lwres/print_p.h
index 3da87535ff..97f3fedfdf 100644
--- a/lib/lwres/print_p.h
+++ b/lib/lwres/print_p.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/unix/Makefile.in b/lib/lwres/unix/Makefile.in
index 0ec707291f..d5c4134b96 100644
--- a/lib/lwres/unix/Makefile.in
+++ b/lib/lwres/unix/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/unix/include/Makefile.in b/lib/lwres/unix/include/Makefile.in
index 57d82c0896..43fc5f996a 100644
--- a/lib/lwres/unix/include/Makefile.in
+++ b/lib/lwres/unix/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/unix/include/lwres/Makefile.in b/lib/lwres/unix/include/lwres/Makefile.in
index 3536a9ed0e..43bb1a5975 100644
--- a/lib/lwres/unix/include/lwres/Makefile.in
+++ b/lib/lwres/unix/include/lwres/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/unix/include/lwres/net.h b/lib/lwres/unix/include/lwres/net.h
index 339c0813c4..200e97d6a5 100644
--- a/lib/lwres/unix/include/lwres/net.h
+++ b/lib/lwres/unix/include/lwres/net.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/version.c b/lib/lwres/version.c
index aed912360f..cf623ad394 100644
--- a/lib/lwres/version.c
+++ b/lib/lwres/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/DLLMain.c b/lib/lwres/win32/DLLMain.c
index e70c6554c3..88b7850569 100644
--- a/lib/lwres/win32/DLLMain.c
+++ b/lib/lwres/win32/DLLMain.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/Makefile.in b/lib/lwres/win32/Makefile.in
index 0ec707291f..d5c4134b96 100644
--- a/lib/lwres/win32/Makefile.in
+++ b/lib/lwres/win32/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/Makefile.in b/lib/lwres/win32/include/Makefile.in
index 57d82c0896..43fc5f996a 100644
--- a/lib/lwres/win32/include/Makefile.in
+++ b/lib/lwres/win32/include/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/lwres/Makefile.in b/lib/lwres/win32/include/lwres/Makefile.in
index 9adad65bcd..7a031d708e 100644
--- a/lib/lwres/win32/include/lwres/Makefile.in
+++ b/lib/lwres/win32/include/lwres/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/lwres/int.h b/lib/lwres/win32/include/lwres/int.h
index 3be928abe0..f6bf863b67 100644
--- a/lib/lwres/win32/include/lwres/int.h
+++ b/lib/lwres/win32/include/lwres/int.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/lwres/net.h b/lib/lwres/win32/include/lwres/net.h
index bb62c3ea25..49ddc86366 100644
--- a/lib/lwres/win32/include/lwres/net.h
+++ b/lib/lwres/win32/include/lwres/net.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/lwres/netdb.h b/lib/lwres/win32/include/lwres/netdb.h
index e7f4e6f764..e4a9be4047 100644
--- a/lib/lwres/win32/include/lwres/netdb.h
+++ b/lib/lwres/win32/include/lwres/netdb.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/include/lwres/platform.h b/lib/lwres/win32/include/lwres/platform.h
index 98ed975634..576434eb47 100644
--- a/lib/lwres/win32/include/lwres/platform.h
+++ b/lib/lwres/win32/include/lwres/platform.h
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/lwconfig.c b/lib/lwres/win32/lwconfig.c
index 7c6c3bb908..56254ba14b 100644
--- a/lib/lwres/win32/lwconfig.c
+++ b/lib/lwres/win32/lwconfig.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/lwres/win32/version.c b/lib/lwres/win32/version.c
index e90678b6ef..36813b97bf 100644
--- a/lib/lwres/win32/version.c
+++ b/lib/lwres/win32/version.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/win32/bindevt/bindevt.c b/lib/win32/bindevt/bindevt.c
index f0abc1793d..13d32edf34 100644
--- a/lib/win32/bindevt/bindevt.c
+++ b/lib/win32/bindevt/bindevt.c
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
diff --git a/lib/win32/bindevt/bindevt.mc b/lib/win32/bindevt/bindevt.mc
index 6982ff20aa..f222315736 100644
--- a/lib/win32/bindevt/bindevt.mc
+++ b/lib/win32/bindevt/bindevt.mc
@@ -1,5 +1,4 @@
 ; Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-; Copyright (C) Internet Software Consortium.
 ;
 ; Permission to use, copy, modify, and/or distribute this software for any
 ; purpose with or without fee is hereby granted, provided that the above
diff --git a/make/Makefile.in b/make/Makefile.in
index 8bb0b424f5..3a718e105b 100644
--- a/make/Makefile.in
+++ b/make/Makefile.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/make/includes.in b/make/includes.in
index f1112e8561..65524f34f6 100644
--- a/make/includes.in
+++ b/make/includes.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/make/rules.in b/make/rules.in
index 8146a49fcd..b675c26abf 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -1,5 +1,4 @@
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/altbuild.sh b/util/altbuild.sh
index 8f4384cc3c..9e5bcf6025 100644
--- a/util/altbuild.sh
+++ b/util/altbuild.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/check-changes b/util/check-changes
index d43e76bdd9..e401c0b2ae 100644
--- a/util/check-changes
+++ b/util/check-changes
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/check-includes.pl b/util/check-includes.pl
index 7de1c8180e..cb2481591e 100644
--- a/util/check-includes.pl
+++ b/util/check-includes.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl -ws
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/check-instincludes.sh b/util/check-instincludes.sh
index 40cd4e8d12..457b106d2a 100644
--- a/util/check-instincludes.sh
+++ b/util/check-instincludes.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/check-pullups.pl b/util/check-pullups.pl
index e38811c089..c61dce2b98 100644
--- a/util/check-pullups.pl
+++ b/util/check-pullups.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/check-sources.pl b/util/check-sources.pl
index 4585c57d65..730fed0cd2 100644
--- a/util/check-sources.pl
+++ b/util/check-sources.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl -ws
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/kit.sh b/util/kit.sh
index 8acb17d32a..683a51b892 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/mandoc2docbook.pl b/util/mandoc2docbook.pl
index f81045addb..8a92b1e220 100644
--- a/util/mandoc2docbook.pl
+++ b/util/mandoc2docbook.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/mdnbuildtest.sh b/util/mdnbuildtest.sh
index 9aa62267da..ec56a67aff 100644
--- a/util/mdnbuildtest.sh
+++ b/util/mdnbuildtest.sh
@@ -1,7 +1,6 @@
 #! /bin/sh -ex
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/memleak.pl b/util/memleak.pl
index 9c6fc2bf0b..c96eff7419 100644
--- a/util/memleak.pl
+++ b/util/memleak.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/merge_copyrights b/util/merge_copyrights
index 0253b11c70..92685dc855 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -1,7 +1,6 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/nanny.pl b/util/nanny.pl
index 1e6ee3874c..7cf7c5486f 100644
--- a/util/nanny.pl
+++ b/util/nanny.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/nt-kit b/util/nt-kit
index 469715e24e..9b88444da8 100644
--- a/util/nt-kit
+++ b/util/nt-kit
@@ -1,7 +1,6 @@
 #! /bin/sh -ex
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/spacewhack.pl b/util/spacewhack.pl
index a486ad85c9..ceb37f66bb 100644
--- a/util/spacewhack.pl
+++ b/util/spacewhack.pl
@@ -1,7 +1,6 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/update-drafts.pl b/util/update-drafts.pl
index 4838e6a74c..d103c90ae7 100644
--- a/util/update-drafts.pl
+++ b/util/update-drafts.pl
@@ -1,7 +1,6 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/util/update_copyrights b/util/update_copyrights
index 29143b8b19..de1833e69d 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -1,7 +1,6 @@
 #!/usr/local/bin/perl -w
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/win32utils/build.txt b/win32utils/build.txt
index c1af180b81..b499c02279 100644
--- a/win32utils/build.txt
+++ b/win32utils/build.txt
@@ -1,5 +1,7 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
 
+See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
+
        BIND 9.10 for Win32 Source Build Instructions.  17-Apr-2015
 
 Building BIND 9.10 on Windows has the following prerequisites:
diff --git a/win32utils/legacy/makedefs.pl b/win32utils/legacy/makedefs.pl
index 59311952e1..d890595f9b 100644
--- a/win32utils/legacy/makedefs.pl
+++ b/win32utils/legacy/makedefs.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
 #
 # Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
diff --git a/win32utils/legacy/win32-build.txt b/win32utils/legacy/win32-build.txt
index 0c6dea33f8..275b2a284c 100644
--- a/win32utils/legacy/win32-build.txt
+++ b/win32utils/legacy/win32-build.txt
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 $Id$
diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt
index cf89f2aeec..91966fdefd 100644
--- a/win32utils/readme1st.txt
+++ b/win32utils/readme1st.txt
@@ -1,4 +1,5 @@
 Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
 See COPYRIGHT in the source root or http://isc.org/copyright.html for terms.
 
 NOTES ON BIND 9.9 FOR WINDOWS: