diff --git a/Vagrantfile b/Vagrantfile
index c59e2c189..566984492 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/apache b/actions/apache
index d7c36caeb..9306d01ab 100755
--- a/actions/apache
+++ b/actions/apache
@@ -1,7 +1,7 @@
#!/usr/bin/python3
# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/auth-pubtkt b/actions/auth-pubtkt
index 1b10b4c0f..f1fdb8cc9 100755
--- a/actions/auth-pubtkt
+++ b/actions/auth-pubtkt
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/bind b/actions/bind
index d1c055611..c41d8fd39 100755
--- a/actions/bind
+++ b/actions/bind
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/cockpit b/actions/cockpit
index 37da474e7..6acb08f3e 100755
--- a/actions/cockpit
+++ b/actions/cockpit
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/deluge b/actions/deluge
index 3560b7146..b5d88a3ff 100755
--- a/actions/deluge
+++ b/actions/deluge
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/diaspora b/actions/diaspora
index 21ed764b9..c8cd46ba1 100755
--- a/actions/diaspora
+++ b/actions/diaspora
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/domainname-change b/actions/domainname-change
index 54a397675..9149d89ae 100755
--- a/actions/domainname-change
+++ b/actions/domainname-change
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/dynamicdns b/actions/dynamicdns
index f465f3a0d..1b64e37e2 100755
--- a/actions/dynamicdns
+++ b/actions/dynamicdns
@@ -1,22 +1,23 @@
#!/bin/bash
+#
+# This file is part of FreedomBox.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
+#
+
############################################################################
# #
-# This file is part of Plinth. #
-# #
-# This program is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU Affero General Public License as #
-# published by the Free Software Foundation, either version 3 of the #
-# License, or (at your option) any later version. #
-# #
-# This program is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU Affero General Public License for more details. #
-# #
-# You should have received a copy of the GNU Affero General Public License #
-# along with this program. If not, see . #
-# #
-# #
# This script is a wrapper around ez-ipupdate and/or wget #
# to update a Dynamic DNS account. The script is used as an #
# interface between plinth and ez-ipupdate #
diff --git a/actions/ejabberd b/actions/ejabberd
index 217988bf5..ac4e90c47 100755
--- a/actions/ejabberd
+++ b/actions/ejabberd
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/firewall b/actions/firewall
index 51d1c5273..6f8151c3e 100755
--- a/actions/firewall
+++ b/actions/firewall
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/hostname-change b/actions/hostname-change
index 0ae714366..532e2db03 100755
--- a/actions/hostname-change
+++ b/actions/hostname-change
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/ikiwiki b/actions/ikiwiki
index 19e92576d..764322265 100755
--- a/actions/ikiwiki
+++ b/actions/ikiwiki
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/infinoted b/actions/infinoted
index ff3395175..fd1ca6135 100755
--- a/actions/infinoted
+++ b/actions/infinoted
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/letsencrypt b/actions/letsencrypt
index 7991fef51..fac8f7c93 100755
--- a/actions/letsencrypt
+++ b/actions/letsencrypt
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/matrixsynapse b/actions/matrixsynapse
index f0c115386..659a31872 100755
--- a/actions/matrixsynapse
+++ b/actions/matrixsynapse
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/mediawiki b/actions/mediawiki
index 7f322d01f..e41de049e 100755
--- a/actions/mediawiki
+++ b/actions/mediawiki
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/minetest b/actions/minetest
index 139974345..b7db3a51b 100755
--- a/actions/minetest
+++ b/actions/minetest
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/monkeysphere b/actions/monkeysphere
index 479f8a456..efd802750 100755
--- a/actions/monkeysphere
+++ b/actions/monkeysphere
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/openvpn b/actions/openvpn
index b3f67a51f..30674e683 100755
--- a/actions/openvpn
+++ b/actions/openvpn
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/packages b/actions/packages
index 619d7632c..3e9282762 100755
--- a/actions/packages
+++ b/actions/packages
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/pagekite b/actions/pagekite
index 39b7b7db5..448ec6323 100755
--- a/actions/pagekite
+++ b/actions/pagekite
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/power b/actions/power
index f21a71fc1..6229b594a 100755
--- a/actions/power
+++ b/actions/power
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/privoxy b/actions/privoxy
index 97b93b741..fdf58904c 100755
--- a/actions/privoxy
+++ b/actions/privoxy
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/radicale b/actions/radicale
index 9cb6187a1..186e8243a 100755
--- a/actions/radicale
+++ b/actions/radicale
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/repro b/actions/repro
index a480cd31f..9fe3b4c4f 100755
--- a/actions/repro
+++ b/actions/repro
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/roundcube b/actions/roundcube
index 225a2aa5d..e36136887 100755
--- a/actions/roundcube
+++ b/actions/roundcube
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/security b/actions/security
index be3ea966f..82d775460 100755
--- a/actions/security
+++ b/actions/security
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/service b/actions/service
index 662e786ed..dd2bc0190 100755
--- a/actions/service
+++ b/actions/service
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/shaarli b/actions/shaarli
index 2aba6ee37..b3c318bf6 100755
--- a/actions/shaarli
+++ b/actions/shaarli
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/shadowsocks b/actions/shadowsocks
index 242b78a67..670e09ca3 100755
--- a/actions/shadowsocks
+++ b/actions/shadowsocks
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/snapshot b/actions/snapshot
index 5b4648851..051100ec0 100755
--- a/actions/snapshot
+++ b/actions/snapshot
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/ssh b/actions/ssh
index 08b5a9de4..9b8afac1d 100755
--- a/actions/ssh
+++ b/actions/ssh
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/storage b/actions/storage
index 7fa644619..83980c6a3 100755
--- a/actions/storage
+++ b/actions/storage
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/syncthing b/actions/syncthing
index 170aad378..2cd6fd0fc 100755
--- a/actions/syncthing
+++ b/actions/syncthing
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/tahoe-lafs b/actions/tahoe-lafs
index c4770af56..792c3ad53 100755
--- a/actions/tahoe-lafs
+++ b/actions/tahoe-lafs
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/timezone-change b/actions/timezone-change
index dd7c946da..cef4d764f 100755
--- a/actions/timezone-change
+++ b/actions/timezone-change
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/tor b/actions/tor
index ca3412f5a..b414018a0 100755
--- a/actions/tor
+++ b/actions/tor
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/transmission b/actions/transmission
index f0f136fb8..7e727a515 100755
--- a/actions/transmission
+++ b/actions/transmission
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/ttrss b/actions/ttrss
index 0e8593b1d..33de44e2b 100755
--- a/actions/ttrss
+++ b/actions/ttrss
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/upgrades b/actions/upgrades
index 1211c3993..33cf39878 100755
--- a/actions/upgrades
+++ b/actions/upgrades
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/actions/users b/actions/users
index 9e778d327..5762de0f1 100755
--- a/actions/users
+++ b/actions/users
@@ -1,7 +1,6 @@
#!/usr/bin/python3
-# -*- mode: python -*-
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/bin/plinth b/bin/plinth
index 14b6f3419..22548efe1 100755
--- a/bin/plinth
+++ b/bin/plinth
@@ -1,6 +1,6 @@
#!/usr/bin/python3
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman b/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
index d528eba42..096a5f3a0 100755
--- a/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
+++ b/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/data/lib/systemd/system/plinth.service b/data/lib/systemd/system/plinth.service
index f93d2189d..dc17ab6b0 100644
--- a/data/lib/systemd/system/plinth.service
+++ b/data/lib/systemd/system/plinth.service
@@ -1,5 +1,5 @@
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/data/usr/share/polkit-1/rules.d/50-plinth.rules b/data/usr/share/polkit-1/rules.d/50-plinth.rules
index 1998bc122..57822c766 100644
--- a/data/usr/share/polkit-1/rules.d/50-plinth.rules
+++ b/data/usr/share/polkit-1/rules.d/50-plinth.rules
@@ -1,6 +1,6 @@
/*
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/doc/Makefile b/doc/Makefile
index 40fcf4654..96359df6d 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
#
-# This file is part of Plinth.
+# This file is part of FreedomBox.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
diff --git a/doc/fetch-images.xslt b/doc/fetch-images.xslt
index 480f62d13..86a6b88d8 100644
--- a/doc/fetch-images.xslt
+++ b/doc/fetch-images.xslt
@@ -1,7 +1,7 @@