diff --git a/app/main/forms.py b/app/main/forms.py
index 323605481..c3d72b74d 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -923,7 +923,7 @@ class TextNotReceivedForm(StripWhitespaceForm):
 
 
 class RenameServiceForm(StripWhitespaceForm):
-    name = StringField(
+    name = GovukTextInputField(
         u'Service name',
         validators=[
             DataRequired(message='Cannot be empty'),
diff --git a/app/templates/views/service-settings/name-local.html b/app/templates/views/service-settings/name-local.html
index 30eb83640..fa48fbeac 100644
--- a/app/templates/views/service-settings/name-local.html
+++ b/app/templates/views/service-settings/name-local.html
@@ -1,6 +1,5 @@
 
 {% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
@@ -38,7 +37,7 @@
   </div>
 
   {% call form_wrapper() %}
-    {{ textbox(form.name) }}
+    {{ form.name }}
     {{ page_footer('Save') }}
   {% endcall %}
 
diff --git a/app/templates/views/service-settings/name.html b/app/templates/views/service-settings/name.html
index bec0c936a..921b2a5d4 100644
--- a/app/templates/views/service-settings/name.html
+++ b/app/templates/views/service-settings/name.html
@@ -1,6 +1,5 @@
 
 {% extends "withnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
@@ -29,7 +28,7 @@
   </div>
 
   {% call form_wrapper() %}
-    {{ textbox(form.name) }}
+    {{ form.name }}
     {{ page_footer('Save') }}
   {% endcall %}
 
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index d7a1b3da3..2cdbb6505 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -493,7 +493,7 @@ def test_service_name_change_fails_if_new_name_has_less_than_2_alphanumeric_char
     )
     assert not mock_service_name_is_unique.called
     assert not mock_update_service.called
-    assert page.find("span", {"class": "error-message"})
+    assert page.find("span", {"class": "govuk-error-message"})
 
 
 @pytest.mark.parametrize('user, expected_text, expected_link', [