diff --git a/bench/bench_lru.c b/bench/bench_lru.c
index 1967f43230892130019f1681fa1aa418e8647656..06f77c0d9f5be9d9fb42c2b68ae7100bc3fca189 100644
--- a/bench/bench_lru.c
+++ b/bench/bench_lru.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/contrib/base32hex.c b/contrib/base32hex.c
index 31c5bbde1ee64da8a0efc76c8808aad490b0895d..b12718ec83c0b4d78923360b0cb519b6e124501f 100644
--- a/contrib/base32hex.c
+++ b/contrib/base32hex.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2011-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/contrib/base32hex.h b/contrib/base32hex.h
index ed90ceffc2e0724031e704cdb76e84e6bd4bdaef..24167863c10832bf5f93444069d84e6af2a441d4 100644
--- a/contrib/base32hex.h
+++ b/contrib/base32hex.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2011-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 /*!
diff --git a/contrib/base64.c b/contrib/base64.c
index 845b99c52b7a67e6d2b791805983cf3bcefa21a3..e5c004e543db349c96800c0bc2438aca134f02ed 100644
--- a/contrib/base64.c
+++ b/contrib/base64.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/contrib/base64.h b/contrib/base64.h
index 3c71431eb431c9d08c7b5721a2ea2d3ee1e4e6c1..153aa72059746d738d519da09fdb849653e53f20 100644
--- a/contrib/base64.h
+++ b/contrib/base64.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2011-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 /*!
diff --git a/contrib/base64url.c b/contrib/base64url.c
index a01520570735e0b430a2066f25cb72c2fa313da0..b7c7d2b2e6cd2a45f52f0883ea1f9a8280441fa6 100644
--- a/contrib/base64url.c
+++ b/contrib/base64url.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/contrib/base64url.h b/contrib/base64url.h
index 875ecfa2a77b5837f18e69f9c6d486b1e67d9a9e..ad7c6e94ae60c5b25fa3b63c929496eda5788a59 100644
--- a/contrib/base64url.h
+++ b/contrib/base64url.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/contrib/cleanup.h b/contrib/cleanup.h
index 7d6cdbedc1aa6e09e4fb28b9be4728ddfe923628..c9d170a553af1dd7f120f89d8195179db307fa9f 100644
--- a/contrib/cleanup.h
+++ b/contrib/cleanup.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
 */
 /**
diff --git a/contrib/dynarray.h b/contrib/dynarray.h
index 06722ea1ea34abe189d20edc70134421624cdc5e..7cbb686b93276ca15402d4ccf6bde0d3fd7bb172 100644
--- a/contrib/dynarray.h
+++ b/contrib/dynarray.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/contrib/mempattern.c b/contrib/mempattern.c
index ae3bd6f58b626b6786fd1200155ea6c40d4f99fd..6c237eac72d8c7c2e5808f8a8f189e3405511833 100644
--- a/contrib/mempattern.c
+++ b/contrib/mempattern.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/contrib/mempattern.h b/contrib/mempattern.h
index a0cd9a62d29bd3a30cedbe607e1ac14e0e031381..4db147ae5db4c8c6328a376c063a053c73f7a578 100644
--- a/contrib/mempattern.h
+++ b/contrib/mempattern.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/daemon/bindings/api.h b/daemon/bindings/api.h
index 7ad6840e8be1f9f1072bbfe627da9952b70d477d..2b43385102d618da183f77225cf1ec131c840aaa 100644
--- a/daemon/bindings/api.h
+++ b/daemon/bindings/api.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/cache.c b/daemon/bindings/cache.c
index 4b1688228f715e734b8cd7848422722efab77c2e..d42ff627696bd43cc1f56dca988ba6a19a740ecc 100644
--- a/daemon/bindings/cache.c
+++ b/daemon/bindings/cache.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/event.c b/daemon/bindings/event.c
index 0c5a6ba97b8f53c01e18ab5993e19977b95049e6..4cefa13051a492b8a5f35eb3b355ac3353d1cfa6 100644
--- a/daemon/bindings/event.c
+++ b/daemon/bindings/event.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/impl.c b/daemon/bindings/impl.c
index 6f1383c70d9dc8d06a8b25159b407a0d68b0d364..8c48df8e32bc934b625dbda2230f839e467f354e 100644
--- a/daemon/bindings/impl.c
+++ b/daemon/bindings/impl.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/impl.h b/daemon/bindings/impl.h
index 5b923b5225b57d3d971a1ebaf5a7537664f52299..d52275617ef32a83cc253c033e6150d93955e5ef 100644
--- a/daemon/bindings/impl.h
+++ b/daemon/bindings/impl.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/modules.c b/daemon/bindings/modules.c
index 5116ff33c56d49aeb15ebb74e4b32a4eecf51647..acae270ce7a95af0c0b2492b2a6e9824aad0708e 100644
--- a/daemon/bindings/modules.c
+++ b/daemon/bindings/modules.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/net.c b/daemon/bindings/net.c
index cd0a3e366f54346c2e46371a2c4fa69da06f39bb..f1fa6f3a3301692f6b6b3fb70399892a8cf517cb 100644
--- a/daemon/bindings/net.c
+++ b/daemon/bindings/net.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/bindings/worker.c b/daemon/bindings/worker.c
index f0a533f5309b55bb39f106cffbddb5f8856574a9..d98500098d9c14736b050e838b177729ea131db6 100644
--- a/daemon/bindings/worker.c
+++ b/daemon/bindings/worker.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/engine.c b/daemon/engine.c
index d18ed11d7d20d01f17a1afb99ae211178c5263a6..26c225f39e65adda281c058181f73a41228d1598 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/engine.h b/daemon/engine.h
index d724f9255b4453bdf4551b7c835bfbdd27d2add9..63accd372fa3dcaba86abdc84f43bd54d17d8c71 100644
--- a/daemon/engine.h
+++ b/daemon/engine.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/ffimodule.c b/daemon/ffimodule.c
index 073b12c04138423762a37688752bf30e0ac9e406..4206b4c802537b5fbd7fd54e63a9059786929c56 100644
--- a/daemon/ffimodule.c
+++ b/daemon/ffimodule.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/ffimodule.h b/daemon/ffimodule.h
index f86c764c3426d812aeeaafdf7145846e6c984f91..beb1bf122493e636ef63e1d4bcc62a42f159a82e 100644
--- a/daemon/ffimodule.h
+++ b/daemon/ffimodule.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/http.c b/daemon/http.c
index ebc05f8f29a2a9d887ce9829c77d265c266e33fe..0c6f361dd7b60f4bbbe1c7bd66f9e4b5da7acb4e 100644
--- a/daemon/http.c
+++ b/daemon/http.c
@@ -1,6 +1,5 @@
 /*
- *
- * Copyright (C) 2020 CZ.NIC, z.s.p.o
+ * Copyright (C) CZ.NIC, z.s.p.o
  *
  * Initial Author: Jan Hák <jan.hak@nic.cz>
  *
diff --git a/daemon/http.h b/daemon/http.h
index 9c34eef137e9db5983cab2ad962215807c1dd38e..0749e3b8bdb6982b7c6273444ef7499fb73b9e60 100644
--- a/daemon/http.h
+++ b/daemon/http.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 CZ.NIC, z.s.p.o
+ * Copyright (C) CZ.NIC, z.s.p.o
  *
  * Initial Author: Jan Hák <jan.hak@nic.cz>
  *
diff --git a/daemon/io.c b/daemon/io.c
index 4d85792410e9d9c3d1a4577048fa8789ac462c13..47aecccb148504018ef1e4ed42ccbaa6fbd04b22 100644
--- a/daemon/io.c
+++ b/daemon/io.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/io.h b/daemon/io.h
index bc1e800a8bd1383617a34898933d24bc6bca4d81..0e88dc189f404bba23f4a216c6338ca0e3fe340c 100644
--- a/daemon/io.h
+++ b/daemon/io.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/main.c b/daemon/main.c
index 43fbbf09c1d362f086c7151cbd46880b0cf8d0a3..41a55ad525a8c207b51a61c9d288582b0d8cdb5e 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/network.c b/daemon/network.c
index 1a54a4f85dc045f9ac50c91969267e7cdc4f1c5c..a20b1e453afec4dc57dd7787740585d53647031d 100644
--- a/daemon/network.c
+++ b/daemon/network.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/network.h b/daemon/network.h
index 8bc6a0a4da886eea26e16a970143a11139faabbb..e21651fdd0e9bdd4bd69dd8f08e74d1bdeba129c 100644
--- a/daemon/network.h
+++ b/daemon/network.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/proxyv2.c b/daemon/proxyv2.c
index a541541f70d8a292ffe4a10e9c2b78505ae1721c..f977ccbbcad60bb350803eee54892d31c34414cf 100644
--- a/daemon/proxyv2.c
+++ b/daemon/proxyv2.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/proxyv2.h b/daemon/proxyv2.h
index 0167e6226a23b4aceb17329101cff8b84de1c796..2d57744e6464ca9ebddec3f5079fd3a5c049d896 100644
--- a/daemon/proxyv2.h
+++ b/daemon/proxyv2.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/session.c b/daemon/session.c
index 795a445e9d693190b430b4678ddb488f468e4df7..97256be24374e4247a98d24c12acb72d0f3f00a7 100644
--- a/daemon/session.c
+++ b/daemon/session.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/session.h b/daemon/session.h
index e27187458cd96f2be09109c55dc26193ccb01f65..eccf45b5f0e98cd8d5841cb61858351a7182147e 100644
--- a/daemon/session.h
+++ b/daemon/session.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/tls.c b/daemon/tls.c
index 8d69d85675f9107b91fdec3e436f0892ef4d2dfa..9637369e54622871c6f5bf315c252da0afa0ca04 100644
--- a/daemon/tls.c
+++ b/daemon/tls.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2016 American Civil Liberties Union (ACLU)
- *               2016-2018 CZ.NIC, z.s.p.o
+ * Copyright (C) CZ.NIC, z.s.p.o
  *
  * Initial Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  *                 Ondřej Surý <ondrej@sury.org>
diff --git a/daemon/tls.h b/daemon/tls.h
index 23cd903aa2e45205fe7938323c0924214665e20d..76985d6237ca072a2a33aba033b3dd20771a55fd 100644
--- a/daemon/tls.h
+++ b/daemon/tls.h
@@ -1,6 +1,7 @@
-/*  Copyright (C) 2016 American Civil Liberties Union (ACLU)
- *  SPDX-License-Identifier: GPL-3.0-or-later
-*/
+/* Copyright (C) 2016 American Civil Liberties Union (ACLU)
+ * Copyright (C) CZ.NIC, z.s.p.o
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 #pragma once
 
diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c
index 42e053b6f0a66e9b27297f5650e1fafa89e9e21e..48e8d4a05cdb9166086ab78c01d3260e069e7125 100644
--- a/daemon/tls_ephemeral_credentials.c
+++ b/daemon/tls_ephemeral_credentials.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 American Civil Liberties Union (ACLU)
- * Copyright (C) 2016-2017 CZ.NIC, z.s.p.o.
- * 
+ * Copyright (C) CZ.NIC, z.s.p.o.
+ *
  * Initial Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -66,7 +66,7 @@ static gnutls_x509_privkey_t get_ephemeral_privkey ()
 		kr_log_error(TLS, "unable to lock lockfile " EPHEMERAL_PRIVKEY_FILENAME ".lock\n");
 		goto done;
 	}
-	
+
 	if ((err = gnutls_x509_privkey_init (&privkey)) < 0) {
 		kr_log_error(TLS, "gnutls_x509_privkey_init() failed: %d (%s)\n",
 			     err, gnutls_strerror_name(err));
@@ -215,7 +215,7 @@ struct tls_credentials * tls_get_ephemeral_credentials(struct engine *engine)
 			kr_log_error(TLS, "failed to allocate memory for ephemeral credentials\n");
 			goto failure;
 		}
-	}		
+	}
 	if ((privkey = get_ephemeral_privkey()) == NULL) {
 		goto failure;
 	}
diff --git a/daemon/tls_session_ticket-srv.c b/daemon/tls_session_ticket-srv.c
index 68856b6b6db2f9f9ba0f47f44d73ca02f4552b54..b198903005f4019eeeec165175905ed86e32a22d 100644
--- a/daemon/tls_session_ticket-srv.c
+++ b/daemon/tls_session_ticket-srv.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/udp_queue.c b/daemon/udp_queue.c
index 7004d1efa5098c8283e170e406bf97b6ed4e5ccc..7460e041cf6ef0d3564fc5e20444aab63cdc86b4 100644
--- a/daemon/udp_queue.c
+++ b/daemon/udp_queue.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/udp_queue.h b/daemon/udp_queue.h
index 43fd56f1b736295c3d069ce126db8cbe89ec4ade..f4a1ae1ec0f01e322d484230083bcc6c6d4aefe4 100644
--- a/daemon/udp_queue.h
+++ b/daemon/udp_queue.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2019 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/worker.c b/daemon/worker.c
index ed35cb03d16b8cabf239029f1478242010e2a487..90fa8b2ed5cfa35f737629fbfa9b41d31db1ff62 100644
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/worker.h b/daemon/worker.h
index 2eaf0907c122d4b031feea5bc31d0659ef58bee0..8885aebb57f1e8d129786678abb57314e4e163f4 100644
--- a/daemon/worker.h
+++ b/daemon/worker.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/zimport.c b/daemon/zimport.c
index 55a651af91ddb6cf5bdac2c4e95a5b51f019644c..af21a159454a0b95251456d90699b205a07c793e 100644
--- a/daemon/zimport.c
+++ b/daemon/zimport.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/daemon/zimport.h b/daemon/zimport.h
index 47974da61935304f0e421d06f3788d6b406f3a1e..5bbd992b08f98cd4b299f16e7b37d4dfcfef6a25 100644
--- a/daemon/zimport.h
+++ b/daemon/zimport.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/distro/pkg/deb/copyright b/distro/pkg/deb/copyright
index dc2c9bbb0f57c0d14c847d5e2fa108e91ee3e21e..96e23ca29608da5c8651d408fc82827ec23f2133 100644
--- a/distro/pkg/deb/copyright
+++ b/distro/pkg/deb/copyright
@@ -3,7 +3,7 @@ Upstream-Name: knot-resolver
 Source: https://www.knot-resolver.cz/
 
 Files: *
-Copyright: 2015-2018 CZ.NIC
+Copyright: CZ.NIC
 License: GPL-3.0+
 
 Files: contrib/ccan/asprintf/*
diff --git a/doc/conf.py b/doc/conf.py
index 05e0d8de9fd220f1249aeb547df03f23ddd3438e..53e5e38cc952e8f8ddcab5d86bfdf1f1424a9d98 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -26,7 +26,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Knot Resolver'
-copyright = u'2014-2020 CZ.NIC labs'
+copyright = u'CZ.NIC labs'
 with open('../meson.build') as f:
     for line in f:
         match = re.match(r"\s*version\s*:\s*'([^']+)'.*", line)
diff --git a/doc/kresd.8.in b/doc/kresd.8.in
index 04a8d888852f0603152b2d1dea7cfc65e54a2359..b052a5afce796f370642cadadc265046580456ab 100644
--- a/doc/kresd.8.in
+++ b/doc/kresd.8.in
@@ -2,7 +2,7 @@
 .\"
 .\" kresd.8 -- kresd daemon manpage
 .\"
-.\" Copyright (c) 2019, CZ.NIC. All rights reserved.
+.\" Copyright (c) CZ.NIC. All rights reserved.
 .\"
 .\" SPDX-License-Identifier: GPL-3.0-or-later
 .\"
diff --git a/lib/cache/api.c b/lib/cache/api.c
index 530592aa689b6d29f414e5e912bf4d15d634dd48..116d775e92d390310e944f682072a652ba373a25 100644
--- a/lib/cache/api.c
+++ b/lib/cache/api.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/api.h b/lib/cache/api.h
index 48cc0d2f2ad3238a2520042e3e133aaf987d4816..0abe9202ffa1a5888a7a58fe1e13b2ed793af549 100644
--- a/lib/cache/api.h
+++ b/lib/cache/api.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/cdb_api.h b/lib/cache/cdb_api.h
index ec184169180afecc2865cd94c361f1670312f7ae..fcca8a9ad56d6342a8541ced5757dc9c1bdcc5c6 100644
--- a/lib/cache/cdb_api.h
+++ b/lib/cache/cdb_api.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
 */
 
diff --git a/lib/cache/cdb_lmdb.c b/lib/cache/cdb_lmdb.c
index 09a1c907ab5f80159bfec043f6ac6e5f57b7c4bc..80c73729ea5d548dfbf694490dfb71d85bb929e8 100644
--- a/lib/cache/cdb_lmdb.c
+++ b/lib/cache/cdb_lmdb.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
 */
 
diff --git a/lib/cache/cdb_lmdb.h b/lib/cache/cdb_lmdb.h
index 3429a222c7288ab881bb9e1d006e9c60a494f30f..988fccf07833ab4652b61016bcb960e3a5739c73 100644
--- a/lib/cache/cdb_lmdb.h
+++ b/lib/cache/cdb_lmdb.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
 */
 
diff --git a/lib/cache/entry_list.c b/lib/cache/entry_list.c
index 31688de1c75c5de8b009ba139563b0f946f65275..4dced2fe746eb4eb6e9f9c0e450a52d659406fca 100644
--- a/lib/cache/entry_list.c
+++ b/lib/cache/entry_list.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/entry_pkt.c b/lib/cache/entry_pkt.c
index 778c0f4d8cd97ac2d26bb809ae62228b2fb42280..884bfaa8c095782c6a3a133ee9ae43f826ea5b71 100644
--- a/lib/cache/entry_pkt.c
+++ b/lib/cache/entry_pkt.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/entry_rr.c b/lib/cache/entry_rr.c
index 7ab5a56a1d32fd12971348f73ec02bdff720df00..3239e7e54260fd11734106d5d647850df02415cc 100644
--- a/lib/cache/entry_rr.c
+++ b/lib/cache/entry_rr.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/impl.h b/lib/cache/impl.h
index a670281e38e89134f4e816ad345824b02beb7c38..305f36eb9ed5028f453bb0fa51b463a2ae90faef 100644
--- a/lib/cache/impl.h
+++ b/lib/cache/impl.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/knot_pkt.c b/lib/cache/knot_pkt.c
index 4c3fc595386ccb46e0e154afe7d585f7320fb913..31fa7e9b0e08976d4af50e1a3b28fa7d2395ac51 100644
--- a/lib/cache/knot_pkt.c
+++ b/lib/cache/knot_pkt.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/nsec1.c b/lib/cache/nsec1.c
index 3fcd05e830cd9b1741d4962cf03f8af1de4dc27c..45543034e81f04e44e8b9d4f771d016dc3501047 100644
--- a/lib/cache/nsec1.c
+++ b/lib/cache/nsec1.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/nsec3.c b/lib/cache/nsec3.c
index 928b680c36e7a35b6e0f28574577e6ea43d65b2b..0b707759e2f28bc5a87086be1ead7d32b38ee4fc 100644
--- a/lib/cache/nsec3.c
+++ b/lib/cache/nsec3.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cache/peek.c b/lib/cache/peek.c
index ef97a5206ac45d12a16cf1920d153069d53c377f..e1901ac3b7b28ecf306a81dc499e1943099829b5 100644
--- a/lib/cache/peek.c
+++ b/lib/cache/peek.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/alg_containers.c b/lib/cookies/alg_containers.c
index e109ae6bdf25ac8658f9f6e12ebe9d6735269275..1da0bda9766d180879611bcf15b2469e697a43f4 100644
--- a/lib/cookies/alg_containers.c
+++ b/lib/cookies/alg_containers.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/alg_containers.h b/lib/cookies/alg_containers.h
index 3b50ccaa9bc630b4072282e52aeeb5438e61383c..5764c281ebcc0cd8ef97a436abf1c21e43e2c9c3 100644
--- a/lib/cookies/alg_containers.h
+++ b/lib/cookies/alg_containers.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/alg_sha.c b/lib/cookies/alg_sha.c
index 43b19eefe9b131834adf63779e733969426887d6..34e79c38520fc478043274a2731797989703c8d8 100644
--- a/lib/cookies/alg_sha.c
+++ b/lib/cookies/alg_sha.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/alg_sha.h b/lib/cookies/alg_sha.h
index de7a75a37c7c13e167d4e45f6fcfc5916aaf2785..e97972ace44f7e3485fa6e0f1adeb8ebee7a4a3c 100644
--- a/lib/cookies/alg_sha.h
+++ b/lib/cookies/alg_sha.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/control.h b/lib/cookies/control.h
index f977c94569349bff1496e5b2be3e6ebc250d6236..475b3fd5343947be598227ef91b3dfe34de70ef6 100644
--- a/lib/cookies/control.h
+++ b/lib/cookies/control.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/helper.c b/lib/cookies/helper.c
index 8ef21517714ebd3969becac346808c83b9eef0f7..48678176799debd609734aa76e6152f01f1876b9 100644
--- a/lib/cookies/helper.c
+++ b/lib/cookies/helper.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/helper.h b/lib/cookies/helper.h
index 0fee2fce28ad429815b5d90809232a95281745ee..dfde90ee83646300598be8b131edd80f380507a8 100644
--- a/lib/cookies/helper.h
+++ b/lib/cookies/helper.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/lru_cache.c b/lib/cookies/lru_cache.c
index 1b629f71bf9567334ef10f9ddbd88d2a44878782..245d1c38f0048b7b4074831669e0ecdb512082d1 100644
--- a/lib/cookies/lru_cache.c
+++ b/lib/cookies/lru_cache.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/lru_cache.h b/lib/cookies/lru_cache.h
index 3594ee13619ddd07cd6e0ec302a49cecd0bb3375..a0f6cab22fe3adf73566b1a698c6000171c1b6cf 100644
--- a/lib/cookies/lru_cache.h
+++ b/lib/cookies/lru_cache.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/nonce.c b/lib/cookies/nonce.c
index 2930ea0a85652eec83f3361b06f647d71b296c64..1b50d876755b3d6968a02067280d363123c65e29 100644
--- a/lib/cookies/nonce.c
+++ b/lib/cookies/nonce.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/cookies/nonce.h b/lib/cookies/nonce.h
index 4d8460f957f8451bb9d7754fc1d0f081e3db1a27..6c2970f9bfe06540370462b8188bfabe78bd26e4 100644
--- a/lib/cookies/nonce.h
+++ b/lib/cookies/nonce.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/defines.h b/lib/defines.h
index 0d678416e283cb8a34a64de1aba2036324d4ddae..6b6dac564e550803eab1253fa7ae89642e385a79 100644
--- a/lib/defines.h
+++ b/lib/defines.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec.c b/lib/dnssec.c
index 3eb6a2ada6fd7f2ff93773585c31305336c0991a..d6ae3cc673334ec06c7341bdfe79c4e365463a4f 100644
--- a/lib/dnssec.c
+++ b/lib/dnssec.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec.h b/lib/dnssec.h
index d9369978e4c3ae1f3f9cfbbb8cf32744f51f99c4..0fbd47c025bc8ccf74a6012e1b1a30b18a646b7c 100644
--- a/lib/dnssec.h
+++ b/lib/dnssec.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/nsec.c b/lib/dnssec/nsec.c
index 7eaeedbe2b23b3c239b52b2e9fc9c1bc5608d9e5..8b1724786e3d1209a4dfc2f0d4a318e0e0da5f2e 100644
--- a/lib/dnssec/nsec.c
+++ b/lib/dnssec/nsec.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/nsec.h b/lib/dnssec/nsec.h
index 1ba9ec8e649f5ea4808e70a2a49143a8a2b20981..a173fa54470f9ffd3298dbd7317b9b85b081ad0d 100644
--- a/lib/dnssec/nsec.h
+++ b/lib/dnssec/nsec.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/nsec3.c b/lib/dnssec/nsec3.c
index e260b0460247e8ac538bb3d1b459b7a6fd718801..037d5bdc5d8863d50e128ef7019265b02bc8c683 100644
--- a/lib/dnssec/nsec3.c
+++ b/lib/dnssec/nsec3.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/nsec3.h b/lib/dnssec/nsec3.h
index 0fdbfcef0541ae0a1745d75a2ec3d5c62a7b1433..eb0bd39781925d723316df575da105fc17c59364 100644
--- a/lib/dnssec/nsec3.h
+++ b/lib/dnssec/nsec3.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/signature.c b/lib/dnssec/signature.c
index 062067a0b969f52586334fe8e040c9da688df306..aadb5cb9f7015de5b5558721f23d11f93bb2a874 100644
--- a/lib/dnssec/signature.c
+++ b/lib/dnssec/signature.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/signature.h b/lib/dnssec/signature.h
index 247d253eac4be501590005100c2de6d7b09cd775..1cc6c8f61dc7a948eff126011adddf217b35d895 100644
--- a/lib/dnssec/signature.h
+++ b/lib/dnssec/signature.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/ta.c b/lib/dnssec/ta.c
index 574563bec3eed9b7b04aecb46988774d9fc3c2b4..becf7d8108ba8e3c429ea48b53efbf9a51a4f8fc 100644
--- a/lib/dnssec/ta.c
+++ b/lib/dnssec/ta.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/dnssec/ta.h b/lib/dnssec/ta.h
index 73292162dd275e7311234a1bf2aa9b03f3e13db6..1eb1dd94b742557d3dc3dab3bd08c272191babfe 100644
--- a/lib/dnssec/ta.h
+++ b/lib/dnssec/ta.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/array.h b/lib/generic/array.h
index 6f969a2228dbff719f3a58e647b8be4ecee1fcb0..9f351189d1181ed4c454a89a6e5b9d6914afb436 100644
--- a/lib/generic/array.h
+++ b/lib/generic/array.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/lru.c b/lib/generic/lru.c
index 5ad791f7c3a34afb033873c62c0dea587793aea7..857b20b3514530837dcfe17d7dbb437a603d8ad5 100644
--- a/lib/generic/lru.c
+++ b/lib/generic/lru.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/lru.h b/lib/generic/lru.h
index 32aabd7d511c6f9186a543b0e7240a64081536c6..448c1b92f35c3e1291a8b4796b618658e7c02e3e 100644
--- a/lib/generic/lru.h
+++ b/lib/generic/lru.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 /**
diff --git a/lib/generic/pack.h b/lib/generic/pack.h
index c4aef3d358a7c8bcc8a676ea40f8fdd472dca7d1..18d57db51ecaf1a73ab5c950b95e3b1a00507d6f 100644
--- a/lib/generic/pack.h
+++ b/lib/generic/pack.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/queue.c b/lib/generic/queue.c
index 8834875241a57f6a794cec0c196e0814253ca9f4..5bed153ef6b6a44f4a24f4912aabe026b81577ee 100644
--- a/lib/generic/queue.c
+++ b/lib/generic/queue.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/queue.h b/lib/generic/queue.h
index 034e5266ef8fbe6f17481486c29f078e47f355f1..3fa52cea6b4dc7ee1716c9e8e8de22f408bad022 100644
--- a/lib/generic/queue.h
+++ b/lib/generic/queue.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 /**
diff --git a/lib/generic/test_array.c b/lib/generic/test_array.c
index 98c5958449a45d84e82e2a11fdc0382829844579..3e95b497337559c850c8f1bb053b150ded20df5f 100644
--- a/lib/generic/test_array.c
+++ b/lib/generic/test_array.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/test_lru.c b/lib/generic/test_lru.c
index 5cd4811e8c99f8e44a3cf43608a34462e3b580c2..7c2f11f05efd25950758c281b2560c1effa7b0c4 100644
--- a/lib/generic/test_lru.c
+++ b/lib/generic/test_lru.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/test_pack.c b/lib/generic/test_pack.c
index 692f253dd164f3eb6d469723f39b7064b55d3a68..e1c1ab596e9e151441d0436e2b33af58720916dd 100644
--- a/lib/generic/test_pack.c
+++ b/lib/generic/test_pack.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/test_queue.c b/lib/generic/test_queue.c
index 3a6b5be96e7bb02bcd1d60cecb589761dfe5cfee..eb26b01a9875545b86d139b70fadf7d18adba3d5 100644
--- a/lib/generic/test_queue.c
+++ b/lib/generic/test_queue.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/test_trie.c b/lib/generic/test_trie.c
index c71005aedc0fa3a7dca6d1771584e18bd281d6dc..9ecd67cd97d20a26074899c4ccb6e142fd913c6d 100644
--- a/lib/generic/test_trie.c
+++ b/lib/generic/test_trie.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/generic/trie.c b/lib/generic/trie.c
index 51a37b93fee5281c2517b3e108b84eeecb8ff2bc..f9aceda799bc54e4480163a1738fd6a4760cfacf 100644
--- a/lib/generic/trie.c
+++ b/lib/generic/trie.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
 
     The code originated from https://github.com/fanf2/qp/blob/master/qp.c
diff --git a/lib/generic/trie.h b/lib/generic/trie.h
index 8c4429767c826d586e7c188842e69c9d53a978ba..a5f0347adec3d00e3796187ce97bbf8197cc2ea4 100644
--- a/lib/generic/trie.h
+++ b/lib/generic/trie.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017-2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/layer.h b/lib/layer.h
index 1e7d112c908ea5e659365ba33150dfb68a933756..77215608adf734422ffa40c088809a47030b5c81 100644
--- a/lib/layer.h
+++ b/lib/layer.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/layer/cache.c b/lib/layer/cache.c
index a532efdfe129e86584218656633baea9fe7b3703..2f1ba6057780fd40f9c6877e2c65d5a7edc350ec 100644
--- a/lib/layer/cache.c
+++ b/lib/layer/cache.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/layer/iterate.c b/lib/layer/iterate.c
index 2a37e68565097c1e0b60f7ef6254e2851d5f306a..98202a1869110d20da36d378c3bfe45b4d0836db 100644
--- a/lib/layer/iterate.c
+++ b/lib/layer/iterate.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/layer/iterate.h b/lib/layer/iterate.h
index e5ebe3838a11e33b941f499901fd3c0f772d2ade..4ea435179f68cddb0a0f15f47649b8f0aff6822d 100644
--- a/lib/layer/iterate.h
+++ b/lib/layer/iterate.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/layer/validate.c b/lib/layer/validate.c
index 68e85659ce5077baca205815f410e44111548a05..93f1d4fc6f19b0b88a539150714deee65ab7366d 100644
--- a/lib/layer/validate.c
+++ b/lib/layer/validate.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/log.c b/lib/log.c
index 968172a1d13469956691eaae10034538ee243ad1..1a3d7154172dbfedff585b09001daab06f1e2c12 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/log.h b/lib/log.h
index 272f9af0a87422dd8022c3af464bfa8149d7272e..1a0237a18e5c9f1dd5c0220d17f350cb3f5d8f30 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/module.c b/lib/module.c
index e38ce61843e3e3845049cc69d8d5ce3f5973713f..83ae77370977733a8e75084fc3850f3a7e6afb17 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/module.h b/lib/module.h
index 011acbb74e3838c7ff82f2b3402edd974b69f66d..7548803cfa045cd45ddf458a09058eca07fae933 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/resolve.c b/lib/resolve.c
index bd38a5f5d03a1d40eb197771422987e283bddbd2..aa3d52153085f6548461be3c7f21b29bb947cf5c 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/resolve.h b/lib/resolve.h
index 64c9fc3c604c906062e5cd0287ad46b23847c234..97ba07b7ade9b6a919fd58ead0d40f2e88d114c7 100644
--- a/lib/resolve.h
+++ b/lib/resolve.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/rplan.c b/lib/rplan.c
index 821563d6040cb1f3d0cd884cba87670019c9fad4..0bedd8a732796797ff306c015197483b29b7a8be 100644
--- a/lib/rplan.c
+++ b/lib/rplan.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/rplan.h b/lib/rplan.h
index f210231b82f4e580e128488416fed2339abe0e6e..891781fcb29926d6fd4e35ce1a1a63fd6df1b2ad 100644
--- a/lib/rplan.h
+++ b/lib/rplan.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/selection.c b/lib/selection.c
index 0a112884c40ccfe599df53ee2516029e803c123f..5aa2992c93616911959f623f6e0fce7cd9e66e6c 100644
--- a/lib/selection.c
+++ b/lib/selection.c
@@ -1,3 +1,7 @@
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
+ *  SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
 #include <libknot/dname.h>
 
 #include "lib/selection.h"
diff --git a/lib/selection.h b/lib/selection.h
index 468638bf36de44f615f248d3b8c6e4b66e4fc296..34cc69c4d788de5e3ca4d028495a4777e0338106 100644
--- a/lib/selection.h
+++ b/lib/selection.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/selection_forward.c b/lib/selection_forward.c
index fe33c237313e5083ba86353ce75e655dc5cee091..54f9a12262562c9f8f1efc064a665e4d4ab439e3 100644
--- a/lib/selection_forward.c
+++ b/lib/selection_forward.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/selection_forward.h b/lib/selection_forward.h
index e66274ffc63023307ef517a2737094aa235c5c1d..0c48c405ae8d4efa4b2c4e31c0b89e849b28cb14 100644
--- a/lib/selection_forward.h
+++ b/lib/selection_forward.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
@@ -14,4 +14,4 @@ void forward_choose_transport(struct kr_query *qry,
 void forward_error(struct kr_query *qry, const struct kr_transport *transport,
 		   enum kr_selection_error sel_error);
 void forward_update_rtt(struct kr_query *qry,
-			const struct kr_transport *transport, unsigned rtt);
\ No newline at end of file
+			const struct kr_transport *transport, unsigned rtt);
diff --git a/lib/selection_iter.c b/lib/selection_iter.c
index c59a88c60e4b468fc339d0598f1944f7d06060b1..59782788099ab7a8454f5d256a3e1422be11e48e 100644
--- a/lib/selection_iter.c
+++ b/lib/selection_iter.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/selection_iter.h b/lib/selection_iter.h
index ed8444763a1d1d5e77faba5b0f661ebce3b202d1..692463cbd2fb35f777d0d3f5ef934e2c93b42f4e 100644
--- a/lib/selection_iter.h
+++ b/lib/selection_iter.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2020 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/test_module.c b/lib/test_module.c
index 5a8acfc0f7afbf52e698a8d53daaa9447ad60bb2..d7124c19dd02e6e2df6b3362159273db039aa3b5 100644
--- a/lib/test_module.c
+++ b/lib/test_module.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 201 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/test_rplan.c b/lib/test_rplan.c
index e56ea87dbe2f850b1da4e93822d52990f247ad0e..12f4cc488d04af85936c6469b333d469d7f92f6a 100644
--- a/lib/test_rplan.c
+++ b/lib/test_rplan.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/test_utils.c b/lib/test_utils.c
index a4b846faa5ae49c92e7da3de5b42019afa1c15e9..22f2483d8a14ab25c2658103194289d8ebfc504e 100644
--- a/lib/test_utils.c
+++ b/lib/test_utils.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/test_zonecut.c b/lib/test_zonecut.c
index f97c32d3a5e650ef3dfc8c71c7ca1bafd39610f5..c03996366b068dfea6584eb912b542e23a2f955f 100644
--- a/lib/test_zonecut.c
+++ b/lib/test_zonecut.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/utils.c b/lib/utils.c
index da2b8236c8d1c91236ba7080f4bf4b28dea7696f..c1b25db60a417666dd640dd7b0f9f3ee3abec840 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/utils.h b/lib/utils.h
index 30ed4c49d271bc2e475dc7ace417989883b03abf..0d1d8456b75780bf1fa8124b8c6f00f73c24e829 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2021 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/zonecut.c b/lib/zonecut.c
index 00b9145b216fcf7de99f5415cca203cc23941f60..4ec403672a8e5ea648c40a4b5a541acd90ccce1d 100644
--- a/lib/zonecut.c
+++ b/lib/zonecut.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/lib/zonecut.h b/lib/zonecut.h
index b44977ae471a7a0b9278c77905eb06eafe6f7f74..9c960ec3c2c360e3a5575a0cc40d770bf53e79fa 100644
--- a/lib/zonecut.h
+++ b/lib/zonecut.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/cookies/cookiectl.c b/modules/cookies/cookiectl.c
index 71673e26bb585de2862c573e54c1c8ba1f41cac6..f1ab80a79119d90e8fecc1e24f960fbeecfb8d01 100644
--- a/modules/cookies/cookiectl.c
+++ b/modules/cookies/cookiectl.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/cookies/cookiectl.h b/modules/cookies/cookiectl.h
index 50ee96636e9b71c05d00d479a13c150860e98f8d..6740e16554a26573709f49084a0378f1a15128ee 100644
--- a/modules/cookies/cookiectl.h
+++ b/modules/cookies/cookiectl.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/cookies/cookiemonster.c b/modules/cookies/cookiemonster.c
index af4655b4457e7a124ef954b1c347545eecb0577b..595317bf5391d93c5dd7d095ace2a38de63a01ea 100644
--- a/modules/cookies/cookiemonster.c
+++ b/modules/cookies/cookiemonster.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/cookies/cookiemonster.h b/modules/cookies/cookiemonster.h
index 5663b503de4ef5ded12d5660dc3d24fce7326988..ab1fdeb9662c97ab1fcabc3f2e9c8e487808a94e 100644
--- a/modules/cookies/cookiemonster.h
+++ b/modules/cookies/cookiemonster.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/cookies/cookies.c b/modules/cookies/cookies.c
index 3ad82a1627b7a688e8c894e5554b73046488239e..5b688d3f060b19408c52ca768483a25b04a6cbaf 100644
--- a/modules/cookies/cookies.c
+++ b/modules/cookies/cookies.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/edns_keepalive/edns_keepalive.c b/modules/edns_keepalive/edns_keepalive.c
index 609aa9d131b6e3ddf73cf4cdfccd989c6c0ae4b2..30d5df32ca0d25745d7573aab3d05c7264a9629c 100644
--- a/modules/edns_keepalive/edns_keepalive.c
+++ b/modules/edns_keepalive/edns_keepalive.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/hints/hints.c b/modules/hints/hints.c
index 7bdcd2ca3f42e603c5e0eec57d87f8f812f94c9d..34c08b9ff2ae33115870492fc38ebcaadbd55926 100644
--- a/modules/hints/hints.c
+++ b/modules/hints/hints.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/modules/stats/stats.c b/modules/stats/stats.c
index ffbcf803c154cd81e079a3c44a78d1baf5c24896..ebb2877832eb95dd5454a6f74c5d2963c8f7d85e 100644
--- a/modules/stats/stats.c
+++ b/modules/stats/stats.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/systemd/kresd.systemd.7.in b/systemd/kresd.systemd.7.in
index e92613ec361147107bf774bd7b2fd6b71af517d2..a602b8e68888a3af1c2975b2b5f79cbf04c00c8a 100644
--- a/systemd/kresd.systemd.7.in
+++ b/systemd/kresd.systemd.7.in
@@ -2,7 +2,7 @@
 .\"
 .\" kresd.systemd.7 -- man page for systemd units for kresd
 .\"
-.\" Copyright (c) 2018, CZ.NIC. All rights reserved.
+.\" Copyright (c) CZ.NIC. All rights reserved.
 .\"
 .\" SPDX-License-Identifier: GPL-3.0-or-later
 .\"
diff --git a/tests/unit/mock_cmodule.c b/tests/unit/mock_cmodule.c
index 5f4b6ed264524d914c43138acd24b0d87a5100d8..9cc9d1af2b06c0bb1526b27c808da00457e86c9c 100644
--- a/tests/unit/mock_cmodule.c
+++ b/tests/unit/mock_cmodule.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2015-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/tests/unit/test.h b/tests/unit/test.h
index 2c609973c571d438823e0a02a994901145b16810..9a7eb58a6a7d46b832ac317da5354bc9ed799dd0 100644
--- a/tests/unit/test.h
+++ b/tests/unit/test.h
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2014-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 
diff --git a/utils/client/kresc.c b/utils/client/kresc.c
index 2dc107c3ac1f7fd9f8f1421c7189747a49220df6..16782a130887f31d1d66042d9f0eb211d412163c 100644
--- a/utils/client/kresc.c
+++ b/utils/client/kresc.c
@@ -1,4 +1,4 @@
-/*  Copyright (C) 2016-2017 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) CZ.NIC, z.s.p.o. <knot-resolver@labs.nic.cz>
  *  SPDX-License-Identifier: GPL-3.0-or-later
  */
 #include <arpa/inet.h>