diff --git a/plinth/modules/letsencrypt/tests/test_domain_name_changes.py b/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
index 394a7a3fd..9ec0c8fec 100644
--- a/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
+++ b/plinth/modules/letsencrypt/tests/test_domain_name_changes.py
@@ -30,7 +30,7 @@ from .. import on_domain_added, on_domain_removed
 @pytest.fixture(name='domain_types')
 def fixture_domain_types():
     """Create a domain types required for tests."""
-    DomainType('domain-type-tor', 'Tor Hidden Service', 'tor:index',
+    DomainType('domain-type-tor', 'Tor Onion Service', 'tor:index',
                can_have_certificate=False)
     DomainType('domain-type-test', 'Test Domain Type', 'test:index')
 
diff --git a/plinth/modules/names/__init__.py b/plinth/modules/names/__init__.py
index 39338f908..59b0a434e 100644
--- a/plinth/modules/names/__init__.py
+++ b/plinth/modules/names/__init__.py
@@ -43,7 +43,7 @@ manual_page = 'NameServices'
 description = [
     format_lazy(
         _('Name Services provides an overview of the ways {box_name} can be '
-          'reached from the public Internet: domain name, Tor hidden service, '
+          'reached from the public Internet: domain name, Tor onion service, '
           'and Pagekite. For each type of name, it is shown whether the HTTP, '
           'HTTPS, and SSH services are enabled or disabled for incoming '
           'connections through the given name.'), box_name=(cfg.box_name))
diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py
index aebfc6833..f97e78307 100644
--- a/plinth/modules/tor/__init__.py
+++ b/plinth/modules/tor/__init__.py
@@ -77,7 +77,7 @@ class TorApp(app_module.App):
                               'tor:index', parent_url_name='apps')
         self.add(menu_item)
 
-        domain_type = DomainType('domain-type-tor', _('Tor Hidden Service'),
+        domain_type = DomainType('domain-type-tor', _('Tor Onion Service'),
                                  'tor:index', can_have_certificate=False)
         self.add(domain_type)
 
diff --git a/plinth/modules/tor/forms.py b/plinth/modules/tor/forms.py
index d8dbd508e..41a38807c 100644
--- a/plinth/modules/tor/forms.py
+++ b/plinth/modules/tor/forms.py
@@ -125,10 +125,10 @@ class TorForm(forms.Form):  # pylint: disable=W0232
             'to censor this node. This helps others circumvent censorship.'),
                               box_name=_(cfg.box_name)))
     hs_enabled = forms.BooleanField(
-        label=_('Enable Tor Hidden Service'),
+        label=_('Enable Tor Onion Service'),
         required=False,
         help_text=format_lazy(_(
-            'A hidden service will allow {box_name} to provide selected '
+            'An onion service will allow {box_name} to provide selected '
             'services (such as wiki or chat) without revealing its '
             'location. Do not use this for strong anonymity yet.'),
                               box_name=_(cfg.box_name)))
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index c4f6473f2..bd8f16171 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -64,7 +64,7 @@
       <table class="table table-bordered table-condensed table-striped tor-hs">
         <thead>
           <tr>
-            <th>{% trans "Hidden Service" %}</th>
+            <th>{% trans "Onion Service" %}</th>
             <th>{% trans "Status" %}</th>
             <th>{% trans "Ports" %}</th>
           </tr>