diff --git a/Vagrantfile b/Vagrantfile
index 566984492..1260a1e31 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -27,7 +27,7 @@ Vagrant.configure(2) do |config|
     systemctl daemon-reload
     systemctl restart plinth
   SHELL
-  config.vm.post_up_message = "FreedomBox machine is ready for Plinth development.
+  config.vm.post_up_message = "FreedomBox machine is ready for development.
 You can access it on https://localhost:4430/plinth/ (with an invalid
 SSL certificate). You can modify source code on the host machine and
 then test it by running:
diff --git a/actions/letsencrypt b/actions/letsencrypt
index 32f069cef..2db19f4b7 100755
--- a/actions/letsencrypt
+++ b/actions/letsencrypt
@@ -99,13 +99,14 @@ def parse_arguments():
     delete_parser.add_argument('--domain', required=True,
                                help='Domain name to delete certificate of')
 
-    help_hooks = 'Plinth management of certificates (for current domain).'
+    help_hooks = 'FreedomBox management of certificates (for current domain).'
     manage_hook_parser = subparsers.add_parser('manage_hooks', help=help_hooks)
     manage_hook_parser.add_argument('command', help=help_hooks,
                                     choices=('enable', 'disable', 'status'))
     manage_hook_parser.add_argument('--domain',
                                     help='Domain for hook management command.')
-    help_module_arg = 'For enable: Also use LE cert with other Plinth modules.'
+    help_module_arg = 'For enable: Also use LE cert with other FreedomBox ' \
+                      'apps.'
     manage_hook_parser.add_argument('--modules', help=help_module_arg,
                                     nargs='+', default=[],
                                     choices=le.MODULES_WITH_HOOKS)
diff --git a/actions/service b/actions/service
index 98e3a4ab7..420326e73 100755
--- a/actions/service
+++ b/actions/service
@@ -153,9 +153,9 @@ def _get_managed_services():
 def _assert_service_is_managed_by_plinth(service_name):
     managed_services = _get_managed_services()
     if service_name not in managed_services:
-        msg = ("The service '%s' is not managed by Plinth. Access is only "
+        msg = ("The service '%s' is not managed by FreedomBox. Access is only "
                "permitted for services listed in the 'managed_services' "
-               "variable of any Plinth module.")  % service_name
+               "variable of any FreedomBox app.") % service_name
         raise ValueError(msg)
 
 
diff --git a/plinth/__main__.py b/plinth/__main__.py
index 51b2083b6..15d4ceaa3 100644
--- a/plinth/__main__.py
+++ b/plinth/__main__.py
@@ -43,7 +43,7 @@ arguments = None
 def parse_arguments():
     """Parse command line arguments"""
     parser = argparse.ArgumentParser(
-        description='Plinth web interface for FreedomBox',
+        description='Core functionality and web interface for FreedomBox',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
     # TODO: server_dir is actually a url prefix; use a better variable name
     parser.add_argument('--server_dir', default=cfg.server_dir,
diff --git a/plinth/tests/coverage/coverage.py b/plinth/tests/coverage/coverage.py
index c442db1e6..8609e08e4 100644
--- a/plinth/tests/coverage/coverage.py
+++ b/plinth/tests/coverage/coverage.py
@@ -90,7 +90,7 @@ class CoverageCommand(setuptools.Command):
         cov.stop()
 
         # Generate an HTML report
-        html_report_title = 'FreedomBox:Plinth -- Test Coverage as of ' + \
+        html_report_title = 'FreedomBox -- Test Coverage as of ' + \
                             time.strftime('%x %X %Z')
         cov.html_report(directory=COVERAGE_REPORT_DIR, omit=FILES_TO_OMIT,
                         title=html_report_title)