diff --git a/plinth/modules/names/templates/names.html b/plinth/modules/names/templates/names.html
index 11cdb7202..9b3cc0591 100644
--- a/plinth/modules/names/templates/names.html
+++ b/plinth/modules/names/templates/names.html
@@ -1,4 +1,4 @@
-{% extends "simple_app.html" %}
+{% extends "app.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
diff --git a/plinth/modules/names/views.py b/plinth/modules/names/views.py
index 103768a33..64bcd211c 100644
--- a/plinth/modules/names/views.py
+++ b/plinth/modules/names/views.py
@@ -32,6 +32,7 @@ def index(request):
     return TemplateResponse(
         request, 'names.html', {
             'title': names.name,
+            'name': names.name,
             'description': names.description,
             'manual_page': names.manual_page,
             'status': status