diff --git a/actions/firewall b/actions/firewall
index 6f8151c3e..c389353bf 100755
--- a/actions/firewall
+++ b/actions/firewall
@@ -15,9 +15,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/>.
 #
-
 """
-Configuration helper for Plinth firewall inteface
+Configuration helper for FreedomBox firewall interface.
 """
 
 import argparse
diff --git a/actions/pagekite b/actions/pagekite
index 448ec6323..36d095699 100755
--- a/actions/pagekite
+++ b/actions/pagekite
@@ -15,9 +15,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/>.
 #
-
 """
-Configuration helper for Plinth PageKite interface.
+Configuration helper for PageKite interface.
 """
 
 import argparse
diff --git a/plinth/__init__.py b/plinth/__init__.py
index a83bfdc45..2daaa5745 100644
--- a/plinth/__init__.py
+++ b/plinth/__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 package init file
+Package init file.
 """
 
 __version__ = '0.23.0'
diff --git a/plinth/module_loader.py b/plinth/module_loader.py
index 75df5625b..af45ccef6 100644
--- a/plinth/module_loader.py
+++ b/plinth/module_loader.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/>.
 #
-
 """
-Discover, load and manage Plinth modules
+Discover, load and manage FreedomBox applications.
 """
 
 import collections
diff --git a/plinth/setup.py b/plinth/setup.py
index 6147f597c..cd00d2a19 100644
--- a/plinth/setup.py
+++ b/plinth/setup.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth module with utilites for performing application setup operations.
+Utilities for performing application setup operations.
 """
 
 import logging
diff --git a/plinth/signals.py b/plinth/signals.py
index a248ef8ab..6c8181c15 100644
--- a/plinth/signals.py
+++ b/plinth/signals.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Plinth signals
+Django signals emitted within FreedomBox.
 """
 
 from django.dispatch import Signal
diff --git a/plinth/tests/__init__.py b/plinth/tests/__init__.py
index b8fdea4b2..70fc4854e 100644
--- a/plinth/tests/__init__.py
+++ b/plinth/tests/__init__.py
@@ -15,9 +15,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/>.
 #
-
 """
-Module initializer for Plinth test cases containing test suite
+Module initializer for FreedomBox test cases containing test suite.
 """
 
 import unittest
diff --git a/plinth/tests/test_context_processors.py b/plinth/tests/test_context_processors.py
index 3d858d82d..f15ed9bbc 100644
--- a/plinth/tests/test_context_processors.py
+++ b/plinth/tests/test_context_processors.py
@@ -16,7 +16,7 @@
 #
 
 """
-Test module for Plinth's custom context processors.
+Test module for custom context processors.
 """
 from unittest.mock import Mock, MagicMock
 
diff --git a/plinth/tests/test_middleware.py b/plinth/tests/test_middleware.py
index 5b1e95d7b..62abd7c32 100644
--- a/plinth/tests/test_middleware.py
+++ b/plinth/tests/test_middleware.py
@@ -16,7 +16,7 @@
 #
 
 """
-Test module for Plinth's custom middleware.
+Test module for custom middleware.
 """
 
 from unittest.mock import Mock, MagicMock, patch
diff --git a/plinth/tests/test_utils.py b/plinth/tests/test_utils.py
index 140583869..b47e5d5ef 100644
--- a/plinth/tests/test_utils.py
+++ b/plinth/tests/test_utils.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/>.
 #
-
 """
-Test module for Plinth's utilities.
+Test module for utilities.
 """
 
 import tempfile
diff --git a/plinth/views.py b/plinth/views.py
index 979e704cb..5f74b6b5a 100644
--- a/plinth/views.py
+++ b/plinth/views.py
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 """
-Main Plinth views
+Main FreedomBox views.
 """
 
 from django.contrib import messages
diff --git a/setup.py b/setup.py
index 106f04255..1cbf994dc 100755
--- a/setup.py
+++ b/setup.py
@@ -15,9 +15,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 setup file
+FreedomBox Service setup file.
 """
 
 from distutils import log