diff --git a/app/models/scheme.rb b/app/models/scheme.rb
index bd1a4b2ee..eedf2ba4f 100644
--- a/app/models/scheme.rb
+++ b/app/models/scheme.rb
@@ -49,7 +49,7 @@ class Scheme < ApplicationRecord
 
   PRIMARY_CLIENT_GROUP = {
     "Homeless families with support needs": "O",
-    "Offenders & people at risk of offending": "H",
+    "Offenders and people at risk of offending": "H",
     "Older people with support needs": "M",
     "People at risk of domestic violence": "L",
     "People with a physical or sensory disability": "A",
diff --git a/app/views/schemes/details.html.erb b/app/views/schemes/details.html.erb
index 415b1d3e5..d8202d53e 100644
--- a/app/views/schemes/details.html.erb
+++ b/app/views/schemes/details.html.erb
@@ -40,13 +40,13 @@
         :name,
         legend: { text: "What is this type of scheme?", size: "m" } %>
 
-      <% care_acts_selection = Scheme.registered_under_care_acts.keys.reverse.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
-
       <%= f.govuk_collection_radio_buttons :registered_under_care_act,
-        care_acts_selection,
-        :id,
-        :name,
-        legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %>
+                                           @scheme.care_acts_options_with_hint,
+                                           :id,
+                                           :name,
+                                           :description,
+                                           legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" },
+                                           bold_labels: false %>
 
       <% organisations = Organisation.all.map { |org| OpenStruct.new(id: org.id, name: org.name) } %>
 
diff --git a/app/views/schemes/new.html.erb b/app/views/schemes/new.html.erb
index 5097102f6..75fc4f8cc 100644
--- a/app/views/schemes/new.html.erb
+++ b/app/views/schemes/new.html.erb
@@ -44,14 +44,13 @@
         :name,
         legend: { text: "What is this type of scheme?", size: "m" } %>
 
-      <% care_acts_selection = @scheme.care_acts_options_with_hints %>
-
       <%= f.govuk_collection_radio_buttons :registered_under_care_act,
-        care_acts_selection,
-        :id,
-        :name,
+                                           @scheme.care_acts_options_with_hint,
+                                           :id,
+                                           :name,
                                            :description,
-        legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" } %>
+                                           legend: { text: "Is this scheme registered under the Care Standards Act 2000?", size: "m" },
+                                           bold_labels: false %>
 
       <% if current_user.support? %>
         <%= f.govuk_collection_select :owning_organisation_id,
diff --git a/app/views/schemes/primary_client_group.html.erb b/app/views/schemes/primary_client_group.html.erb
index 94ca00065..f4682ebc4 100644
--- a/app/views/schemes/primary_client_group.html.erb
+++ b/app/views/schemes/primary_client_group.html.erb
@@ -14,7 +14,7 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <% primary_client_group_selection = Scheme.primary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+      <% primary_client_group_selection = Scheme.primary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key) } %>
       <%= f.govuk_collection_radio_buttons :primary_client_group,
         primary_client_group_selection,
         :id,
diff --git a/app/views/schemes/secondary_client_group.html.erb b/app/views/schemes/secondary_client_group.html.erb
index eb88881c4..5ef5b1a1a 100644
--- a/app/views/schemes/secondary_client_group.html.erb
+++ b/app/views/schemes/secondary_client_group.html.erb
@@ -14,7 +14,7 @@
     <div class="govuk-grid-column-two-thirds">
       <%= f.govuk_error_summary %>
 
-      <% secondary_client_group_selection = Scheme.secondary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+      <% secondary_client_group_selection = Scheme.secondary_client_groups.keys.excluding("Missing").map { |key, _| OpenStruct.new(id: key, name: key) } %>
       <%= f.govuk_collection_radio_buttons :secondary_client_group,
         secondary_client_group_selection,
         :id,