diff --git a/plinth/modules/apache/__init__.py b/plinth/modules/apache/__init__.py
index 5515055ee..988d44ab0 100644
--- a/plinth/modules/apache/__init__.py
+++ b/plinth/modules/apache/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for Apache server.
+FreedomBox app for Apache server.
 """
 
 from plinth import actions
diff --git a/plinth/modules/api/__init__.py b/plinth/modules/api/__init__.py
index 0a10296ac..f14ded525 100644
--- a/plinth/modules/api/__init__.py
+++ b/plinth/modules/api/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for api for android app.
+FreedomBox app for api for android app.
 """
 
 version = 1
diff --git a/plinth/modules/api/views.py b/plinth/modules/api/views.py
index 3893fd14a..10626f2c5 100644
--- a/plinth/modules/api/views.py
+++ b/plinth/modules/api/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for api for android app.
+FreedomBox app for api for android app.
 """
 
 from django.http import HttpResponse
diff --git a/plinth/modules/avahi/__init__.py b/plinth/modules/avahi/__init__.py
index e8b251db4..c72f4ee80 100644
--- a/plinth/modules/avahi/__init__.py
+++ b/plinth/modules/avahi/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for service discovery.
+FreedomBox app for service discovery.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/bind/__init__.py b/plinth/modules/bind/__init__.py
index f8e87759e..3a4386e82 100644
--- a/plinth/modules/bind/__init__.py
+++ b/plinth/modules/bind/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure BIND server.
+FreedomBox app to configure BIND server.
 """
 
 import re
diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py
index c595be8cf..710290e41 100644
--- a/plinth/modules/cockpit/__init__.py
+++ b/plinth/modules/cockpit/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Cockpit.
+FreedomBox app to configure Cockpit.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/config/__init__.py b/plinth/modules/config/__init__.py
index f3379db2f..0522e74be 100644
--- a/plinth/modules/config/__init__.py
+++ b/plinth/modules/config/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for basic system configuration
+FreedomBox app for basic system configuration.
 """
 
 import socket
diff --git a/plinth/modules/config/views.py b/plinth/modules/config/views.py
index 61add966f..9237408ff 100644
--- a/plinth/modules/config/views.py
+++ b/plinth/modules/config/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth views for basic system configuration
+FreedomBox views for basic system configuration.
 """
 
 import logging
diff --git a/plinth/modules/datetime/__init__.py b/plinth/modules/datetime/__init__.py
index 776f0bf2b..1157ba4fb 100644
--- a/plinth/modules/datetime/__init__.py
+++ b/plinth/modules/datetime/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure system date and time
+FreedomBox app to configure system date and time.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/datetime/views.py b/plinth/modules/datetime/views.py
index 71bcce0b2..316657807 100644
--- a/plinth/modules/datetime/views.py
+++ b/plinth/modules/datetime/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for configuring date and time
+FreedomBox app for configuring date and time.
 """
 
 from django.contrib import messages
diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py
index b8491a92c..1b09a285c 100644
--- a/plinth/modules/deluge/__init__.py
+++ b/plinth/modules/deluge/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure a Deluge web client.
+FreedomBox app to configure a Deluge web client.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/diagnostics/__init__.py b/plinth/modules/diagnostics/__init__.py
index 588e37aa4..5f2f3c81c 100644
--- a/plinth/modules/diagnostics/__init__.py
+++ b/plinth/modules/diagnostics/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for system diagnostics
+FreedomBox app for system diagnostics.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/diagnostics/diagnostics.py b/plinth/modules/diagnostics/diagnostics.py
index 62d6d7990..5f8408ffe 100644
--- a/plinth/modules/diagnostics/diagnostics.py
+++ b/plinth/modules/diagnostics/diagnostics.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for running diagnostics
+FreedomBox app for running diagnostics.
 """
 
 import collections
diff --git a/plinth/modules/diaspora/__init__.py b/plinth/modules/diaspora/__init__.py
index aa7ac96e7..9e664458d 100644
--- a/plinth/modules/diaspora/__init__.py
+++ b/plinth/modules/diaspora/__init__.py
@@ -112,7 +112,7 @@ def setup_domain_name(domain_name):
 
 
 def add_shortcut():
-    """Add shortcut to diaspora on the Plinth homepage"""
+    """Add shortcut to diaspora on the homepage."""
     if is_setup():
         frontpage.add_shortcut(
             'diaspora', name, short_description,
diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py
index c7a9895c2..21c68c1e7 100644
--- a/plinth/modules/dynamicdns/__init__.py
+++ b/plinth/modules/dynamicdns/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure ez-ipupdate client
+FreedomBox app to configure ez-ipupdate client.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/ejabberd/__init__.py b/plinth/modules/ejabberd/__init__.py
index ac9f6604e..83356198b 100644
--- a/plinth/modules/ejabberd/__init__.py
+++ b/plinth/modules/ejabberd/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure ejabberd server
+FreedomBox app to configure ejabberd server.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/firewall/__init__.py b/plinth/modules/firewall/__init__.py
index 5a827c160..1c6da1541 100644
--- a/plinth/modules/firewall/__init__.py
+++ b/plinth/modules/firewall/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure a firewall
+FreedomBox app to configure a firewall.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/firewall/views.py b/plinth/modules/firewall/views.py
index 409094804..f5e83f3f0 100644
--- a/plinth/modules/firewall/views.py
+++ b/plinth/modules/firewall/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure a firewall
+FreedomBox app to configure a firewall.
 """
 
 from django.template.response import TemplateResponse
diff --git a/plinth/modules/first_boot/__init__.py b/plinth/modules/first_boot/__init__.py
index eb4c5545c..7a08970ce 100644
--- a/plinth/modules/first_boot/__init__.py
+++ b/plinth/modules/first_boot/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for first boot wizard
+FreedomBox app for first boot wizard.
 """
 
 import operator
diff --git a/plinth/modules/help/__init__.py b/plinth/modules/help/__init__.py
index cab097507..030aaf76a 100644
--- a/plinth/modules/help/__init__.py
+++ b/plinth/modules/help/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for help pages
+FreedomBox app for help pages.
 """
 
 from . import help  # pylint: disable-msg=W0622
diff --git a/plinth/modules/help/help.py b/plinth/modules/help/help.py
index 1ef8ae431..9c0c5354a 100644
--- a/plinth/modules/help/help.py
+++ b/plinth/modules/help/help.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Help module for Plinth.
+Help app for FreedomBox.
 """
 
 import mimetypes
diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py
index 226044650..ab8b7cf0e 100644
--- a/plinth/modules/ikiwiki/__init__.py
+++ b/plinth/modules/ikiwiki/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure ikiwiki
+FreedomBox app to configure ikiwiki.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/ikiwiki/views.py b/plinth/modules/ikiwiki/views.py
index a0e2dcd7e..1b71b44ea 100644
--- a/plinth/modules/ikiwiki/views.py
+++ b/plinth/modules/ikiwiki/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring ikiwiki
+FreedomBox app for configuring ikiwiki.
 """
 
 from django.contrib import messages
diff --git a/plinth/modules/infinoted/__init__.py b/plinth/modules/infinoted/__init__.py
index cc23e968c..fa1cdfe6e 100644
--- a/plinth/modules/infinoted/__init__.py
+++ b/plinth/modules/infinoted/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for infinoted.
+FreedomBox app for infinoted.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/jsxc/__init__.py b/plinth/modules/jsxc/__init__.py
index 423a58357..14ab7723d 100644
--- a/plinth/modules/jsxc/__init__.py
+++ b/plinth/modules/jsxc/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure XMPP web client/jsxc
+FreedomBox app to configure XMPP web client/jsxc.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py
index 7f6b82e0f..232863c86 100644
--- a/plinth/modules/letsencrypt/__init__.py
+++ b/plinth/modules/letsencrypt/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for using Let's Encrypt.
+FreedomBox app for using Let's Encrypt.
 """
 
 import json
diff --git a/plinth/modules/letsencrypt/views.py b/plinth/modules/letsencrypt/views.py
index 40eb3eb78..71b695beb 100644
--- a/plinth/modules/letsencrypt/views.py
+++ b/plinth/modules/letsencrypt/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for using Let's Encrypt.
+FreedomBox app for using Let's Encrypt.
 """
 
 import logging
@@ -101,7 +101,11 @@ def enable_renewal_management(request, domain):
 
 @require_POST
 def toggle_hooks(request, domain):
-    """Toggle pointing of certbot's hooks to Plinth, for the current domain."""
+    """Toggle pointing of certbot's hooks to FreedomBox.
+
+    For the current domain.
+
+    """
     manage_hooks_status = letsencrypt.get_manage_hooks_status()
     subcommand = 'disable' if 'enabled' in manage_hooks_status else 'enable'
 
diff --git a/plinth/modules/matrixsynapse/__init__.py b/plinth/modules/matrixsynapse/__init__.py
index 322c09070..a9f42b987 100644
--- a/plinth/modules/matrixsynapse/__init__.py
+++ b/plinth/modules/matrixsynapse/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure matrix-synapse server.
+FreedomBox app to configure matrix-synapse server.
 """
 
 import logging
diff --git a/plinth/modules/mediawiki/__init__.py b/plinth/modules/mediawiki/__init__.py
index a7576b21a..2641498b3 100644
--- a/plinth/modules/mediawiki/__init__.py
+++ b/plinth/modules/mediawiki/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure MediaWiki.
+FreedomBox app to configure MediaWiki.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/mediawiki/forms.py b/plinth/modules/mediawiki/forms.py
index b2c70c5c4..92745185f 100644
--- a/plinth/modules/mediawiki/forms.py
+++ b/plinth/modules/mediawiki/forms.py
@@ -15,7 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring MediaWiki.
+FreedomBox app for configuring MediaWiki.
 """
 
 from django import forms
diff --git a/plinth/modules/mediawiki/views.py b/plinth/modules/mediawiki/views.py
index 879eb1c55..c6fbe5b39 100644
--- a/plinth/modules/mediawiki/views.py
+++ b/plinth/modules/mediawiki/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring MediaWiki.
+FreedomBox app for configuring MediaWiki.
 """
 
 import logging
diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py
index eb2e4a687..f639e4e42 100644
--- a/plinth/modules/minetest/__init__.py
+++ b/plinth/modules/minetest/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for Minetest server.
+FreedomBox app for Minetest server.
 """
 
 import augeas
diff --git a/plinth/modules/monkeysphere/__init__.py b/plinth/modules/monkeysphere/__init__.py
index d59d259c1..15d89a346 100644
--- a/plinth/modules/monkeysphere/__init__.py
+++ b/plinth/modules/monkeysphere/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for monkeysphere.
+FreedomBox app for monkeysphere.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py
index dec63b3f1..9f9e647a5 100644
--- a/plinth/modules/mumble/__init__.py
+++ b/plinth/modules/mumble/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Mumble server
+FreedomBox app to configure Mumble server.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/names/__init__.py b/plinth/modules/names/__init__.py
index 6177fdcce..992be3d64 100644
--- a/plinth/modules/names/__init__.py
+++ b/plinth/modules/names/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure name services
+FreedomBox app to configure name services.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/names/views.py b/plinth/modules/names/views.py
index 8b64e910b..3ba379445 100644
--- a/plinth/modules/names/views.py
+++ b/plinth/modules/names/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for name services
+FreedomBox app for name services.
 """
 
 from django.template.response import TemplateResponse
diff --git a/plinth/modules/networks/__init__.py b/plinth/modules/networks/__init__.py
index 37162183b..af0dc97b2 100644
--- a/plinth/modules/networks/__init__.py
+++ b/plinth/modules/networks/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to interface with network-manager
+FreedomBox app to interface with network-manager.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/openvpn/__init__.py b/plinth/modules/openvpn/__init__.py
index 7055c797d..cc68d5fc6 100644
--- a/plinth/modules/openvpn/__init__.py
+++ b/plinth/modules/openvpn/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure OpenVPN server.
+FreedomBox app to configure OpenVPN server.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/openvpn/forms.py b/plinth/modules/openvpn/forms.py
index d3d86e134..c77b05ea7 100644
--- a/plinth/modules/openvpn/forms.py
+++ b/plinth/modules/openvpn/forms.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for configuring OpenVPN.
+FreedomBox app for configuring OpenVPN.
 """
 
 from django import forms
diff --git a/plinth/modules/openvpn/views.py b/plinth/modules/openvpn/views.py
index ee1321941..7c486b84a 100644
--- a/plinth/modules/openvpn/views.py
+++ b/plinth/modules/openvpn/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for configuring OpenVPN server.
+FreedomBox app for configuring OpenVPN server.
 """
 
 from django.contrib import messages
diff --git a/plinth/modules/pagekite/__init__.py b/plinth/modules/pagekite/__init__.py
index 526fdcd86..13845412a 100644
--- a/plinth/modules/pagekite/__init__.py
+++ b/plinth/modules/pagekite/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure PageKite
+FreedomBox app to configure PageKite.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/power/__init__.py b/plinth/modules/power/__init__.py
index 855fb6dc5..ea6e9b4c2 100644
--- a/plinth/modules/power/__init__.py
+++ b/plinth/modules/power/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for power controls.
+FreedomBox app for power controls.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/power/views.py b/plinth/modules/power/views.py
index d36b43f98..8a4e45098 100644
--- a/plinth/modules/power/views.py
+++ b/plinth/modules/power/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for power module.
+FreedomBox app for power module.
 """
 
 from django.forms import Form
diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py
index a760ddcab..d930bfad8 100644
--- a/plinth/modules/privoxy/__init__.py
+++ b/plinth/modules/privoxy/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Privoxy.
+FreedomBox app to configure Privoxy.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py
index 6e495e5b0..caf8cb0c9 100644
--- a/plinth/modules/quassel/__init__.py
+++ b/plinth/modules/quassel/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for Quassel.
+FreedomBox app for Quassel.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py
index b6ccb3b3c..37adb38d3 100644
--- a/plinth/modules/radicale/__init__.py
+++ b/plinth/modules/radicale/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for radicale.
+FreedomBox app for radicale.
 """
 
 import augeas
diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py
index c6099e123..820e74803 100644
--- a/plinth/modules/repro/__init__.py
+++ b/plinth/modules/repro/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for repro.
+FreedomBox app for repro.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/restore/__init__.py b/plinth/modules/restore/__init__.py
index 57383a7cd..37bb85fc7 100644
--- a/plinth/modules/restore/__init__.py
+++ b/plinth/modules/restore/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure reStore.
+FreedomBox app to configure reStore.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py
index f72e2c139..309201f6e 100644
--- a/plinth/modules/roundcube/__init__.py
+++ b/plinth/modules/roundcube/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Roundcube.
+FreedomBox app to configure Roundcube.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/security/__init__.py b/plinth/modules/security/__init__.py
index 22cf9c8e8..5a37cbe57 100644
--- a/plinth/modules/security/__init__.py
+++ b/plinth/modules/security/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for security configuration
+FreedomBox app for security configuration.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py
index 453417a1f..ea8d2e685 100644
--- a/plinth/modules/shaarli/__init__.py
+++ b/plinth/modules/shaarli/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Shaarli.
+FreedomBox app to configure Shaarli.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/shadowsocks/__init__.py b/plinth/modules/shadowsocks/__init__.py
index c7fc643b0..ccaf91bd3 100644
--- a/plinth/modules/shadowsocks/__init__.py
+++ b/plinth/modules/shadowsocks/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Shadowsocks.
+FreedomBox app to configure Shadowsocks.
 """
 
 from django.urls import reverse_lazy
diff --git a/plinth/modules/shadowsocks/forms.py b/plinth/modules/shadowsocks/forms.py
index a54a54d79..b06f6e08b 100644
--- a/plinth/modules/shadowsocks/forms.py
+++ b/plinth/modules/shadowsocks/forms.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for configuring Shadowsocks.
+FreedomBox app for configuring Shadowsocks.
 """
 
 from django import forms
diff --git a/plinth/modules/shadowsocks/views.py b/plinth/modules/shadowsocks/views.py
index d26ecd068..95836ec81 100644
--- a/plinth/modules/shadowsocks/views.py
+++ b/plinth/modules/shadowsocks/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for configuring Shadowsocks.
+FreedomBox app for configuring Shadowsocks.
 """
 
 import json
diff --git a/plinth/modules/snapshot/__init__.py b/plinth/modules/snapshot/__init__.py
index a1c9ca040..b37e2f782 100644
--- a/plinth/modules/snapshot/__init__.py
+++ b/plinth/modules/snapshot/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to manage filesystem snapshots.
+FreedomBox app to manage filesystem snapshots.
 """
 
 import json
diff --git a/plinth/modules/ssh/__init__.py b/plinth/modules/ssh/__init__.py
index 606057707..9ffe2049d 100644
--- a/plinth/modules/ssh/__init__.py
+++ b/plinth/modules/ssh/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for OpenSSH server.
+FreedomBox app for OpenSSH server.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/sso/__init__.py b/plinth/modules/sso/__init__.py
index 8ea4de133..f44dd4911 100644
--- a/plinth/modules/sso/__init__.py
+++ b/plinth/modules/sso/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Single Sign On services.
+FreedomBox app to configure Single Sign On services.
 """
 
 from plinth import actions
diff --git a/plinth/modules/sso/forms.py b/plinth/modules/sso/forms.py
index 213e747ea..e3bab04e8 100644
--- a/plinth/modules/sso/forms.py
+++ b/plinth/modules/sso/forms.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Forms for the Single Sign On module of Plinth
+Forms for the Single Sign On app of FreedomBox.
 """
 
 from django.contrib.auth.forms import AuthenticationForm as DjangoAuthenticationForm
diff --git a/plinth/modules/sso/views.py b/plinth/modules/sso/views.py
index db37f0443..eea5cd02d 100644
--- a/plinth/modules/sso/views.py
+++ b/plinth/modules/sso/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Views for the Single Sign On module of Plinth
+Views for the Single Sign On app of FreedomBox.
 """
 
 import logging
@@ -54,8 +54,10 @@ def set_ticket_cookie(user, response):
 
 
 class SSOLoginView(LoginView):
-    """View to login to Plinth and set a auth_pubtkt cookie which will be
-    used to provide Single Sign On for some other applications
+    """View to login to FreedomBox and set a auth_pubtkt cookie.
+
+    Cookie will be used to provide Single Sign On for some other applications.
+
     """
     redirect_authenticated_user = True
     template_name = 'login.html'
@@ -101,7 +103,7 @@ def get_ip_address_from_request(request):
 
 
 class SSOLogoutView(LogoutView):
-    """View to log out of Plinth and remove the auth_pubtkt cookie"""
+    """View to log out of FreedomBox and remove the auth_pubtkt cookie."""
     template_name = 'index.html'
 
     def dispatch(self, request, *args, **kwargs):
diff --git a/plinth/modules/storage/__init__.py b/plinth/modules/storage/__init__.py
index 4f9082379..a97984189 100644
--- a/plinth/modules/storage/__init__.py
+++ b/plinth/modules/storage/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to manage storage.
+FreedomBox app to manage storage.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/syncthing/__init__.py b/plinth/modules/syncthing/__init__.py
index 558b7faa4..a6ce1e82b 100644
--- a/plinth/modules/syncthing/__init__.py
+++ b/plinth/modules/syncthing/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Syncthing.
+FreedomBox app to configure Syncthing.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/tahoe/__init__.py b/plinth/modules/tahoe/__init__.py
index bae2452b9..fb9ec7920 100644
--- a/plinth/modules/tahoe/__init__.py
+++ b/plinth/modules/tahoe/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Tahoe-LAFS.
+FreedomBox app to configure Tahoe-LAFS.
 """
 
 import json
diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py
index 4ad6feded..21e2d506f 100644
--- a/plinth/modules/tor/__init__.py
+++ b/plinth/modules/tor/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Tor.
+FreedomBox app to configure Tor.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/tor/views.py b/plinth/modules/tor/views.py
index 195fb513d..886e757b0 100644
--- a/plinth/modules/tor/views.py
+++ b/plinth/modules/tor/views.py
@@ -15,7 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring Tor.
+FreedomBox app for configuring Tor.
 """
 from django.contrib import messages
 from django.template.response import TemplateResponse
diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py
index 0dcd289a2..5f7f7518f 100644
--- a/plinth/modules/transmission/__init__.py
+++ b/plinth/modules/transmission/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to configure Transmission server
+FreedomBox app to configure Transmission server.
 """
 
 import json
diff --git a/plinth/modules/transmission/forms.py b/plinth/modules/transmission/forms.py
index 0cbd65eca..590bc6f65 100644
--- a/plinth/modules/transmission/forms.py
+++ b/plinth/modules/transmission/forms.py
@@ -15,7 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring Transmission.
+FreedomBox app for configuring Transmission.
 """
 
 from django import forms
diff --git a/plinth/modules/transmission/views.py b/plinth/modules/transmission/views.py
index ff1a45212..64d18233c 100644
--- a/plinth/modules/transmission/views.py
+++ b/plinth/modules/transmission/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module for configuring Transmission Server
+FreedomBox app for configuring Transmission Server.
 """
 
 from django.contrib import messages
diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py
index 86c30602c..36abe0056 100644
--- a/plinth/modules/ttrss/__init__.py
+++ b/plinth/modules/ttrss/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module to configure Tiny Tiny RSS.
+FreedomBox app to configure Tiny Tiny RSS.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/upgrades/__init__.py b/plinth/modules/upgrades/__init__.py
index 31c6e72cf..095eced07 100644
--- a/plinth/modules/upgrades/__init__.py
+++ b/plinth/modules/upgrades/__init__.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for upgrades
+FreedomBox app for upgrades.
 """
 
 from django.utils.translation import ugettext_lazy as _
diff --git a/plinth/modules/upgrades/views.py b/plinth/modules/upgrades/views.py
index 82f969e8d..31c62d326 100644
--- a/plinth/modules/upgrades/views.py
+++ b/plinth/modules/upgrades/views.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-
 """
-Plinth module for upgrades
+FreedomBox app for upgrades.
 """
 
 from django.contrib import messages
diff --git a/plinth/modules/users/__init__.py b/plinth/modules/users/__init__.py
index ee6e9abfd..91006bea0 100644
--- a/plinth/modules/users/__init__.py
+++ b/plinth/modules/users/__init__.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module to manage users
+FreedomBox app to manage users.
 """
 
 import subprocess