diff --git a/actions/apache b/actions/apache
index 9306d01ab..d66933ea5 100755
--- a/actions/apache
+++ b/actions/apache
@@ -65,8 +65,8 @@ def subcommand_setup(_):
         # enable mod_headers for HSTS
         webserver.enable('headers', kind='module')
 
-        # enable some critical modules to avoid restart while installing Plinth
-        # applications.
+        # enable some critical modules to avoid restart while installing
+        # FreedomBox applications.
         webserver.enable('cgi', kind='module')
         webserver.enable('authnz_ldap', kind='module')
 
diff --git a/actions/letsencrypt b/actions/letsencrypt
index fac8f7c93..32f069cef 100755
--- a/actions/letsencrypt
+++ b/actions/letsencrypt
@@ -416,8 +416,9 @@ def _run_action(action, action_options=None):
     """
     Run a specific action from another module, for the run_renew_hooks command.
     This function is a simplified version of plinth/actions.py, to enable
-    somewhat safe calls of other actions from outside the Plinth process.
-    The comments about the action contracts refer to plinth/actions.py.
+    somewhat safe calls of other actions from outside the FreedomBox Service
+    (Plinth) process. The comments about the action contracts refer to
+    plinth/actions.py.
     """
     if action_options is None:
         action_options = []
diff --git a/actions/networks b/actions/networks
index 1501cc0b3..7616e598a 100755
--- a/actions/networks
+++ b/actions/networks
@@ -144,14 +144,14 @@ function setup {
 }
 
 #
-# For a user who installed using freedombox-setup Debian package, when Plinth is
-# run for the first time, don't run network setup. This is ensured by checking
-# for the file /var/lib/freedombox/is-freedombox-disk-image which will not
-# exist.
+# For a user who installed using freedombox-setup Debian package, when
+# FreedomBox Service (Plinth) is run for the first time, don't run network
+# setup. This is ensured by checking for the file
+# /var/lib/freedombox/is-freedombox-disk-image which will not exist.
 #
-# For a user who installed using FreedomBox disk image, when Plinth runs for the
-# first time, setup process executes and triggers the script due networks module
-# being an essential module.
+# For a user who installed using FreedomBox disk image, when FreedomBox Service
+# (Plinth) runs for the first time, setup process executes and triggers the
+# script due networks module being an essential module.
 #
 if [ -f "/var/lib/freedombox/is-freedombox-disk-image" ]
 then
diff --git a/actions/service b/actions/service
index dd2bc0190..98e3a4ab7 100755
--- a/actions/service
+++ b/actions/service
@@ -130,7 +130,7 @@ def _get_managed_services_of_module(modulepath):
 
 def _get_managed_services():
     """
-    Get a set of all services managed by Plinth
+    Get a set of all services managed by FreedomBox.
 
     This collects all service-names inside the 'managed_services' variable of
     modules inside 'module_config_path'
diff --git a/actions/users b/actions/users
index 5762de0f1..e1a84c228 100755
--- a/actions/users
+++ b/actions/users
@@ -97,7 +97,7 @@ def subcommand_first_setup(_):
     # XXX: Instead of a separate action that is conditionally called for a
     # version number, we can check if the domain currently configured is what
     # we want and then based on the value do a reconfiguration. This approach
-    # will work better when Plinth state is reset etc.
+    # will work better when FreedomBox state is reset etc.
     action_utils.dpkg_reconfigure('slapd', {'domain': 'thisbox'})
 
 
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 05bf56bef..add5b4f0b 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,8 +1,8 @@
 # This is a consequnce of bug in jsxc
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838183. While is is possible
-# to change the upstream Plinth code to remove the links and create during
-# installation, the jsxc module in Plinth will stop working in certain modes of
-# development. We belive the proper fix for the problem is to fix the above
+# to change the upstream FreedomBox code to remove the links and create during
+# installation, the jsxc module in FreedomBox will stop working in certain modes
+# of development. We belive the proper fix for the problem is to fix the above
 # issue.
 plinth source: source-contains-unsafe-symlink plinth/modules/jsxc/static/img
 plinth source: source-contains-unsafe-symlink plinth/modules/jsxc/static/libjs-jsxc/jsxc.css
diff --git a/plinth/errors.py b/plinth/errors.py
index bb2d3964f..57168eb5b 100644
--- a/plinth/errors.py
+++ b/plinth/errors.py
@@ -21,7 +21,7 @@ Project specific errors
 
 
 class PlinthError(Exception):
-    """Base class for all Plinth specific errors."""
+    """Base class for all FreedomBox specific errors."""
     pass
 
 
diff --git a/plinth/locale/da/LC_MESSAGES/terms.org b/plinth/locale/da/LC_MESSAGES/terms.org
index d197b545b..543b4199b 100644
--- a/plinth/locale/da/LC_MESSAGES/terms.org
+++ b/plinth/locale/da/LC_MESSAGES/terms.org
@@ -1,5 +1,5 @@
 List of commonly used terms with multiple Danish Translation
-candidates and the one used for Plinth.
+candidates and the one used for FreedomBox.
 
 Generally it has been sought to use the "less techy" option with
 a good established meaning in commonly spoken Danish. Also with
diff --git a/plinth/migrations/0001_initial.py b/plinth/migrations/0001_initial.py
index 62e169cda..c7c741922 100644
--- a/plinth/migrations/0001_initial.py
+++ b/plinth/migrations/0001_initial.py
@@ -20,7 +20,7 @@
 #
 
 """
-Initial Django migration for Plinth to create database tables.
+Initial Django migration for FreedomBox to create database tables.
 """
 
 from __future__ import unicode_literals
@@ -29,7 +29,7 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-    """Initial migration schema for Plinth models."""
+    """Initial migration schema for FreedomBox models."""
 
     initial = True
 
diff --git a/plinth/modules/avahi/__init__.py b/plinth/modules/avahi/__init__.py
index c72f4ee80..9f4cee64d 100644
--- a/plinth/modules/avahi/__init__.py
+++ b/plinth/modules/avahi/__init__.py
@@ -67,8 +67,8 @@ def setup(helper, old_version=False):
     """Install and configure the module."""
     helper.install(managed_packages)
     # Reload avahi-daemon now that first-run does not reboot. After performing
-    # Plinth package installation, new Avahi files will be available and
-    # require restart.
+    # FreedomBox Service (Plinth) package installation, new Avahi files will be
+    # available and require restart.
     helper.call('post', actions.superuser_run, 'service',
                 ['reload', 'avahi-daemon'])
 
diff --git a/plinth/modules/users/__init__.py b/plinth/modules/users/__init__.py
index 91006bea0..24da2421d 100644
--- a/plinth/modules/users/__init__.py
+++ b/plinth/modules/users/__init__.py
@@ -44,7 +44,7 @@ first_boot_steps = [
 
 name = _('Users and Groups')
 
-# List of all Plinth user groups
+# List of all FreedomBox user groups
 groups = set()
 
 
diff --git a/plinth/package.py b/plinth/package.py
index 9d20af6a2..cc9f94992 100644
--- a/plinth/package.py
+++ b/plinth/package.py
@@ -72,9 +72,10 @@ class Transaction(object):
     def install(self):
         """Run an apt-get transaction to install given packages.
 
-        Plinth needs to be running as root when calling this.
-        Currently, this is meant to be only during first time setup
-        when --setup is argument is passed.
+        FreedomBox Service (Plinth) needs to be running as root when calling
+        this. Currently, this is meant to be only during first time setup when
+        --setup is argument is passed.
+
         """
         try:
             self._run_apt_command(['update'])
diff --git a/plinth/setup.py b/plinth/setup.py
index cd00d2a19..e3324d18b 100644
--- a/plinth/setup.py
+++ b/plinth/setup.py
@@ -301,8 +301,8 @@ def run_setup_on_modules(module_list, allow_install=True):
     setup on all essential modules only.
 
     allow_install with or without package installation. When setting up
-    essential modules, installing packages is not required as Plinth itself has
-    dependencies on all essential modules.
+    essential modules, installing packages is not required as FreedomBox
+    (Plinth) itself has dependencies on all essential modules.
 
     """
     try:
diff --git a/plinth/tests/test_cfg.py b/plinth/tests/test_cfg.py
index 152e97cd1..4c14f7a6e 100644
--- a/plinth/tests/test_cfg.py
+++ b/plinth/tests/test_cfg.py
@@ -36,7 +36,7 @@ logging.disable(logging.CRITICAL)
 
 
 class TestCfg(unittest.TestCase):
-    """Verify that the Plinth configuration module behaves as expected."""
+    """Verify that the configuration module behaves as expected."""
 
     @classmethod
     def setUpClass(cls):
diff --git a/plinth/tests/test_menu.py b/plinth/tests/test_menu.py
index 07af8c43c..c21013fa9 100644
--- a/plinth/tests/test_menu.py
+++ b/plinth/tests/test_menu.py
@@ -61,7 +61,7 @@ def dump_menu(menu):
 
 
 class MenuTestCase(TestCase):
-    """Verify the behavior of the Plinth Menu class."""
+    """Verify the behavior of the Menu class."""
 
     def test_init(self):
         """Verify that main_menu and essential items are created."""