diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py
index 48b33691f..fd9aa949b 100644
--- a/app/main/views/api_keys.py
+++ b/app/main/views/api_keys.py
@@ -54,7 +54,7 @@ def api_documentation(service_id):
 
 @main.route("/services/<uuid:service_id>/api/whitelist", methods=['GET', 'POST'])
 @user_has_permissions('manage_api_keys')
-def whitelist(service_id):
+def guest_list(service_id):
     form = GuestList()
     if form.validate_on_submit():
         service_api_client.update_whitelist(service_id, {
diff --git a/app/navigation.py b/app/navigation.py
index d98fba4cb..97a30d178 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -348,7 +348,7 @@ class HeaderNavigation(Navigation):
         'view_template_version',
         'no_cookie.view_template_version_preview',
         'view_template_versions',
-        'whitelist',
+        'guest_list',
         'who_can_use_notify',
         'who_its_for',
     }
@@ -480,7 +480,7 @@ class MainNavigation(Navigation):
             'delivery_status_callback',
             'received_text_messages_callback',
             'revoke_api_key',
-            'whitelist',
+            'guest_list',
         },
     }
 
@@ -975,7 +975,7 @@ class CaseworkNavigation(Navigation):
         'view_template_version',
         'no_cookie.view_template_version_preview',
         'view_template_versions',
-        'whitelist',
+        'guest_list',
         'who_can_use_notify',
         'who_its_for',
     }
@@ -1285,7 +1285,7 @@ class OrgNavigation(Navigation):
         'view_template_version',
         'no_cookie.view_template_version_preview',
         'view_template_versions',
-        'whitelist',
+        'guest_list',
         'who_can_use_notify',
         'who_its_for',
     }
diff --git a/app/templates/views/api/index.html b/app/templates/views/api/index.html
index f5633863f..064dd1202 100644
--- a/app/templates/views/api/index.html
+++ b/app/templates/views/api/index.html
@@ -19,7 +19,7 @@
       <a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.api_keys', service_id=current_service.id) }}">API keys</a>
     </div>
     <div class="govuk-grid-column-one-third">
-      <a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.whitelist', service_id=current_service.id) }}">Guest list</a>
+      <a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for('.guest_list', service_id=current_service.id) }}">Guest list</a>
     </div>
     <div class="govuk-grid-column-one-third">
       <a class="govuk-link govuk-link--no-visited-state pill-separate-item" href="{{ url_for(callbacks_link, service_id=current_service.id) }}">Callbacks</a>
diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py
index 5cf6083b3..dd15da606 100644
--- a/tests/app/main/views/test_api_integration.py
+++ b/tests/app/main/views/test_api_integration.py
@@ -421,7 +421,7 @@ def test_should_show_whitelist_page(
     mock_get_whitelist,
 ):
     page = client_request.get(
-        'main.whitelist',
+        'main.guest_list',
         service_id=SERVICE_ONE_ID,
     )
     textboxes = page.find_all('input', {'type': 'text'})
@@ -443,7 +443,7 @@ def test_should_update_whitelist(
     ])
 
     client_request.post(
-        'main.whitelist',
+        'main.guest_list',
         service_id=SERVICE_ONE_ID,
         _data=data,
     )
@@ -459,7 +459,7 @@ def test_should_validate_whitelist_items(
 ):
 
     page = client_request.post(
-        'main.whitelist',
+        'main.guest_list',
         service_id=SERVICE_ONE_ID,
         _data=OrderedDict([
             ('email_addresses-1', 'abc'),