Update copyright notices.

45 files changed, 44 insertions, 65 deletions

diff --git a/gnu/extractor/enum.scm b/gnu/extractor/enum.scm
index e6d69e8..e2f1f93 100644
--- a/gnu/extractor/enum.scm
+++ b/gnu/extractor/enum.scm
@@ -1,7 +1,7 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet
 ;;   scheme-GNUnet contains scheme-extractor.
 ;;   scheme-extractor is a partial Scheme port of libextractor.
-;;   Copyright (C) 2020, 2021 Maxime Devos
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   libextractor is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published
diff --git a/gnu/extractor/metaformats.scm b/gnu/extractor/metaformats.scm
index 949b4e8..1fa3d84 100644
--- a/gnu/extractor/metaformats.scm
+++ b/gnu/extractor/metaformats.scm
@@ -2,7 +2,7 @@
 ;;   scheme-extractor is a partial Scheme port of libextractor.
 ;;   A previous iteration of this file is part of libextractor.
 ;;   Copyright (C) 2002-2017 Vidyut Samanta and Christian Grothoff
-;;   Copyright (C) 2020 Maxime Devos
+;;   Copyright (C) 2020 GNUnet e.V.
 ;;
 ;;   libextractor is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published
diff --git a/gnu/extractor/metatypes.scm b/gnu/extractor/metatypes.scm
index 9f7b9c7..8c700e9 100644
--- a/gnu/extractor/metatypes.scm
+++ b/gnu/extractor/metatypes.scm
@@ -3,7 +3,7 @@
 ;;   scheme-extractor is a partial Scheme port of libextractor.
 ;;   A previous iteration of this file is part of libextractor.
 ;;   Copyright (C) 2002-2017 Vidyut Samanta and Christian Grothoff
-;;   Copyright (C) 2020 Maxime Devos
+;;   Copyright (C) 2020 GNUnet e.V.
 ;;
 ;;   libextractor is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published
diff --git a/gnu/gnunet/concurrency/repeated-condition.scm b/gnu/gnunet/concurrency/repeated-condition.scm
index 70b14b2..34bf62c 100644
--- a/gnu/gnunet/concurrency/repeated-condition.scm
+++ b/gnu/gnunet/concurrency/repeated-condition.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/concurrency/update.scm b/gnu/gnunet/concurrency/update.scm
index 6a487cf..0d562fd 100644
--- a/gnu/gnunet/concurrency/update.scm
+++ b/gnu/gnunet/concurrency/update.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/config/db.scm b/gnu/gnunet/config/db.scm
index 252b594..2806d1d 100644
--- a/gnu/gnunet/config/db.scm
+++ b/gnu/gnunet/config/db.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/config/default.conf b/gnu/gnunet/config/default.conf
index ea019ef..11cc463 100644
--- a/gnu/gnunet/config/default.conf
+++ b/gnu/gnunet/config/default.conf
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2020, 2021 Maxime Devos
+# Copyright (C) 2020, 2021 GNUnet e.V.
 # SPDX-License-Identifier: FSFAP
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/gnu/gnunet/config/expand.scm b/gnu/gnunet/config/expand.scm
index 6d032d4..338df3b 100644
--- a/gnu/gnunet/config/expand.scm
+++ b/gnu/gnunet/config/expand.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
-;; Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020 GNUnet e.V.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020, 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/config/fs.scm b/gnu/gnunet/config/fs.scm
index 1a073ab..bce8296 100644
--- a/gnu/gnunet/config/fs.scm
+++ b/gnu/gnunet/config/fs.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/config/parser.scm b/gnu/gnunet/config/parser.scm
index 022449e..3ac11c9 100644
--- a/gnu/gnunet/config/parser.scm
+++ b/gnu/gnunet/config/parser.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
-;;   Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020 GNUnet e.V.
+;;   Copyright (C) 2006, 2007, 2008, 2009, 2013, 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/config/value-parser.scm b/gnu/gnunet/config/value-parser.scm
index b29dba0..8b5e574 100644
--- a/gnu/gnunet/config/value-parser.scm
+++ b/gnu/gnunet/config/value-parser.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
-;; Copyright (C) 2005-2020 GNUnet e.V.
+;; Copyright (C) 2005-2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/crypto/struct.scm b/gnu/gnunet/crypto/struct.scm
index 7e728c8..cf4a87f 100644
--- a/gnu/gnunet/crypto/struct.scm
+++ b/gnu/gnunet/crypto/struct.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet
-;;   Copyright (C) 2001-2013 GNUnet e.V.
-;;   Copyright (C) 2021 Maxime Devos
+;;   Copyright (C) 2001-2013, 2021 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/data-string.scm b/gnu/gnunet/data-string.scm
index 5d6ae0e..a9fae71 100644
--- a/gnu/gnunet/data-string.scm
+++ b/gnu/gnunet/data-string.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2005--207 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2005--2007, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/directory.scm b/gnu/gnunet/directory.scm
index fbb79c2..f0c75d7 100644
--- a/gnu/gnunet/directory.scm
+++ b/gnu/gnunet/directory.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2003, 2004, 2006, 2009 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2003, 2004, 2006, 2009, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/fs-uri.scm b/gnu/gnunet/fs-uri.scm
index 3105614..dd610bf 100644
--- a/gnu/gnunet/fs-uri.scm
+++ b/gnu/gnunet/fs-uri.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2003--2014 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2003--2014, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/hashcode-ascii.scm b/gnu/gnunet/hashcode-ascii.scm
index 6345816..ca5c125 100644
--- a/gnu/gnunet/hashcode-ascii.scm
+++ b/gnu/gnunet/hashcode-ascii.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2001--2013 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2001--2013, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/hashcode.scm b/gnu/gnunet/hashcode.scm
index de68267..0689804 100644
--- a/gnu/gnunet/hashcode.scm
+++ b/gnu/gnunet/hashcode.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
 ;;   Copyright (C) 2006--2020 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/hashcode/struct.scm b/gnu/gnunet/hashcode/struct.scm
index 7990e2d..549648d 100644
--- a/gnu/gnunet/hashcode/struct.scm
+++ b/gnu/gnunet/hashcode/struct.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2006--2020 GNUnet e.V.
-;;   Copyright (C) 2021 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2006--2021 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/icmp/struct.scm b/gnu/gnunet/icmp/struct.scm
index 2a206d3..385a8d4 100644
--- a/gnu/gnunet/icmp/struct.scm
+++ b/gnu/gnunet/icmp/struct.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/message/protocols.scm b/gnu/gnunet/message/protocols.scm
index c0c7e2f..76cd85c 100644
--- a/gnu/gnunet/message/protocols.scm
+++ b/gnu/gnunet/message/protocols.scm
@@ -1,7 +1,6 @@
 ;; -*- scheme -*- Constants for network protocols
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2001--2020 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2001--2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the
diff --git a/gnu/gnunet/message/protocols.scmgen b/gnu/gnunet/message/protocols.scmgen
index 192f8bc..f89401b 100644
--- a/gnu/gnunet/message/protocols.scmgen
+++ b/gnu/gnunet/message/protocols.scmgen
@@ -1,7 +1,6 @@
 ;; -*- scheme -*- Constants for network protocols
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2001--2020 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2001--2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU General Public License as published by the
diff --git a/gnu/gnunet/metadata.scm b/gnu/gnunet/metadata.scm
index b870dcd..fc57c48 100644
--- a/gnu/gnunet/metadata.scm
+++ b/gnu/gnunet/metadata.scm
@@ -1,6 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/metadata/struct.scm b/gnu/gnunet/metadata/struct.scm
index 1b54c6a..28e1f32 100644
--- a/gnu/gnunet/metadata/struct.scm
+++ b/gnu/gnunet/metadata/struct.scm
@@ -1,7 +1,6 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
 ;;   Adapted from an iteration of (gnu gnunet metadata)
-;;   Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V.
-;;   Copyright (C) 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2020 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq-impl/stream.scm b/gnu/gnunet/mq-impl/stream.scm
index ee49274..ae79ae1 100644
--- a/gnu/gnunet/mq-impl/stream.scm
+++ b/gnu/gnunet/mq-impl/stream.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq.scm b/gnu/gnunet/mq.scm
index 5cecae8..a980c56 100644
--- a/gnu/gnunet/mq.scm
+++ b/gnu/gnunet/mq.scm
@@ -1,6 +1,5 @@
 ;; This file is part of GNUnet.
-;; Copyright (C) 2012-2019 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos (<maximedevos@telenet.be>)
+;; Copyright (C) 2012-2019, 2021 GNUnet e.V.
 ;;
 ;; GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq/envelope.scm b/gnu/gnunet/mq/envelope.scm
index 4826722..ef99748 100644
--- a/gnu/gnunet/mq/envelope.scm
+++ b/gnu/gnunet/mq/envelope.scm
@@ -1,6 +1,5 @@
 ;; This file is part of GNUnet.
-;; Copyright (C) 2012-2019 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos (<maximedevos@telenet.be>)
+;; Copyright (C) 2012-2019, 2021 GNUnet e.V.
 ;;
 ;; GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq/error-reporting.scm b/gnu/gnunet/mq/error-reporting.scm
index 41f4f73..38af1ca 100644
--- a/gnu/gnunet/mq/error-reporting.scm
+++ b/gnu/gnunet/mq/error-reporting.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq/handler.scm b/gnu/gnunet/mq/handler.scm
index 0192c0c..fcb10e2 100644
--- a/gnu/gnunet/mq/handler.scm
+++ b/gnu/gnunet/mq/handler.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq/prio-prefs.scm b/gnu/gnunet/mq/prio-prefs.scm
index 8d1f743..16d6d01 100644
--- a/gnu/gnunet/mq/prio-prefs.scm
+++ b/gnu/gnunet/mq/prio-prefs.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2012-2016 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2012-2016, 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/mq/prio-prefs2.scm b/gnu/gnunet/mq/prio-prefs2.scm
index 2bc7292..971b0b1 100644
--- a/gnu/gnunet/mq/prio-prefs2.scm
+++ b/gnu/gnunet/mq/prio-prefs2.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2012-2016 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2012-2016, 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/netstruct/procedural.scm b/gnu/gnunet/netstruct/procedural.scm
index fd5a6af..efcff58 100644
--- a/gnu/gnunet/netstruct/procedural.scm
+++ b/gnu/gnunet/netstruct/procedural.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2020, 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/netstruct/syntactic.scm b/gnu/gnunet/netstruct/syntactic.scm
index 57366ac..dde6664 100644
--- a/gnu/gnunet/netstruct/syntactic.scm
+++ b/gnu/gnunet/netstruct/syntactic.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2020, 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/nse/client.scm b/gnu/gnunet/nse/client.scm
index 21af1bb..7b0c6dd 100644
--- a/gnu/gnunet/nse/client.scm
+++ b/gnu/gnunet/nse/client.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/nse/struct.scm b/gnu/gnunet/nse/struct.scm
index 4243e07..3434112 100644
--- a/gnu/gnunet/nse/struct.scm
+++ b/gnu/gnunet/nse/struct.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet
-;; Copyright (C) 2001-2011 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2001-2011, 2021 GNUnet e.V.
 ;;
 ;; GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/scripts/download-store.scm b/gnu/gnunet/scripts/download-store.scm
index 322062a..9a2ce1f 100644
--- a/gnu/gnunet/scripts/download-store.scm
+++ b/gnu/gnunet/scripts/download-store.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2021 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/scripts/guix-stuff.scm b/gnu/gnunet/scripts/guix-stuff.scm
index ca129bb..4b9e486 100644
--- a/gnu/gnunet/scripts/guix-stuff.scm
+++ b/gnu/gnunet/scripts/guix-stuff.scm
@@ -1,7 +1,7 @@
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
+;;; Copyright © 2021 GNUnet e.V.
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
diff --git a/gnu/gnunet/scripts/publish-store.scm b/gnu/gnunet/scripts/publish-store.scm
index a41a6c4..49eea3e 100644
--- a/gnu/gnunet/scripts/publish-store.scm
+++ b/gnu/gnunet/scripts/publish-store.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2021 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/util/cmsg.scm b/gnu/gnunet/util/cmsg.scm
index 0b7014b..8379220 100644
--- a/gnu/gnunet/util/cmsg.scm
+++ b/gnu/gnunet/util/cmsg.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2021 GNUnet e.V.
 ;;
 ;;   GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/util/struct.scm b/gnu/gnunet/util/struct.scm
index bdc62a5..f4c3cbb 100644
--- a/gnu/gnunet/util/struct.scm
+++ b/gnu/gnunet/util/struct.scm
@@ -1,6 +1,5 @@
 ;; This file is part of GNUnet.
-;; Copyright (C) 2006-2020 GNUnet e.V.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2006-2021 GNUnet e.V.
 ;;
 ;; GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/utils/bv-slice.scm b/gnu/gnunet/utils/bv-slice.scm
index 6fc9d0d..2f0639e 100644
--- a/gnu/gnunet/utils/bv-slice.scm
+++ b/gnu/gnunet/utils/bv-slice.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2020, 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/utils/decompress.scm b/gnu/gnunet/utils/decompress.scm
index 03a4a43..898f123 100644
--- a/gnu/gnunet/utils/decompress.scm
+++ b/gnu/gnunet/utils/decompress.scm
@@ -1,7 +1,7 @@
 ;;; Zlib bindings, adapted from Guile-zlib
 ;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Mathieu Othacehe <othacehe@gnu.org>
-;;; Copyright © 2020 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;; Copyright © 2020 GNUnet e.V.
 ;;;
 ;;; This file is part of Guile-zlib.
 ;;;
diff --git a/gnu/gnunet/utils/hat-let.scm b/gnu/gnunet/utils/hat-let.scm
index a2304ce..825c606 100644
--- a/gnu/gnunet/utils/hat-let.scm
+++ b/gnu/gnunet/utils/hat-let.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2020, 2021 Maxime Devos <maximedevos@telenet.be>
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/utils/netstruct.scm b/gnu/gnunet/utils/netstruct.scm
index 35f317d..639d018 100644
--- a/gnu/gnunet/utils/netstruct.scm
+++ b/gnu/gnunet/utils/netstruct.scm
@@ -1,5 +1,5 @@
 ;;   This file is part of scheme-GNUnet, a partial Scheme port of GNUnet.
-;;   Copyright (C) 2020, 2021 Maxime Devos <maxime.devos@student.kuleuven.be>
+;;   Copyright (C) 2020, 2021 GNUnet e.V.
 ;;
 ;;   scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;;   under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/utils/platform-enum.scm b/gnu/gnunet/utils/platform-enum.scm
index f3207ca..093aebb 100644
--- a/gnu/gnunet/utils/platform-enum.scm
+++ b/gnu/gnunet/utils/platform-enum.scm
@@ -1,5 +1,5 @@
 ;; This file is part of scheme-GNUnet.
-;; Copyright (C) 2021 Maxime Devos
+;; Copyright (C) 2021 GNUnet e.V.
 ;;
 ;; scheme-GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published
diff --git a/gnu/gnunet/utils/tokeniser.scm b/gnu/gnunet/utils/tokeniser.scm
index 64ac723..079de0a 100644
--- a/gnu/gnunet/utils/tokeniser.scm
+++ b/gnu/gnunet/utils/tokeniser.scm
@@ -1,6 +1,5 @@
 ;; This file is part of scheme-GNUnet, a Scheme port of GNUnet .
-;;  Copyright (C) 2010, 2016, 2017 GNUnet e.V.
-;;  Copyright (C) 2021 Maxime Devos <maximedevos@telenet.be>
+;;  Copyright (C) 2010, 2016, 2017, 2021 GNUnet e.V.
 ;;
 ;; GNUnet is free software: you can redistribute it and/or modify it
 ;; under the terms of the GNU Affero General Public License as published