Rename some of the settings

This reflects the language we use for these things when talking about
them amongst ourselves.

app/templates/views/organisations/organisation/settings/edit-type.html

@@ -1,21 +1,18 @@
 {% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
+{% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
 
 {% extends "org_template.html" %}
 
 {% block org_page_title %}
-  Organisation type
+  Organisation sector
 {% endblock %}
 
 {% block maincolumn_content %}
-  <h1 class="heading-large">Organisation type</h1>
-  <div class="grid-row">
-    <div class="column-five-sixths">
-      {% call form_wrapper() %}
-        {{ radios(form.organisation_type) }}
-        {{ page_footer('Save') }}
-      {% endcall %}
-    </div>
-  </div>
+  {{ page_header("Organisation sector") }}
+  {% call form_wrapper() %}
+    {{ radios(form.organisation_type) }}
+    {{ page_footer('Save') }}
+  {% endcall %}
 {% endblock %}

app/templates/views/organisations/organisation/settings/index.html

@@ -15,7 +15,7 @@
       caption_visible=False
     ) %}
       {% call row() %}
-        {{ text_field('Organisation name') }}
+        {{ text_field('Name') }}
         {{ text_field(current_org.name) }}
         {{ edit_field(
             'Change',
@@ -24,7 +24,7 @@
         }}
       {% endcall %}
       {% call row() %}
-        {{ text_field('Organisation type') }}
+        {{ text_field('Sector') }}
         {{ optional_text_field({
           'central': 'Central government',
           'local': 'Local government',

tests/app/main/views/organisations/test_organisation.py

@@ -181,8 +181,8 @@ def test_organisation_settings_for_platform_admin(
 ):
     expected_rows = [
         'Label Value Action',
-        'Organisation name Org 1 Change',
-        'Organisation type Not set Change',
+        'Name Org 1 Change',
+        'Sector Not set Change',
         'Crown organisation Yes Change',
         'Data sharing and financial agreement Not signed Change',
         'Request to go live notes None Change',