diff --git a/spec/features/publish/courses/editing_degree_requirements_spec.rb b/spec/features/publish/courses/editing_degree_requirements_spec.rb
index 033ee4fd64..16b60924ac 100644
--- a/spec/features/publish/courses/editing_degree_requirements_spec.rb
+++ b/spec/features/publish/courses/editing_degree_requirements_spec.rb
@@ -130,8 +130,8 @@
           expect(publish_degree_subject_requirement_page.copy_content_warning).to have_content(name)
         end
 
-        expect(publish_degree_subject_requirement_page.yes_radio).to be_checked
-        expect(publish_degree_subject_requirement_page.no_radio).not_to be_checked
+        expect(publish_degree_subject_requirement_page.radio_yes).to be_checked
+        expect(publish_degree_subject_requirement_page.radio_no).not_to be_checked
         expect(publish_degree_subject_requirement_page.requirements.text).to eq(course2.degree_subject_requirements)
       end
 
@@ -174,12 +174,12 @@ def when_i_visit_the_degrees_subject_requirements_page
   end
 
   def and_i_require_a_classification
-    publish_degree_start_page.yes_radio.choose
+    publish_degree_start_page.radio_yes.choose
     and_i_submit
   end
 
   def and_i_do_not_require_a_classification
-    publish_degree_start_page.no_radio.choose
+    publish_degree_start_page.radio_no.choose
     and_i_submit
   end
 
@@ -199,7 +199,7 @@ def then_i_should_see_the_subject_requirements_page
   def when_i_set_additional_requirements
     @some_additional_requiremet = 'Some additional requirement'
 
-    publish_degree_subject_requirement_page.yes_radio.choose
+    publish_degree_subject_requirement_page.radio_yes.choose
     publish_degree_subject_requirement_page.requirements.set(@some_additional_requiremet)
     and_i_submit
   end
@@ -224,7 +224,7 @@ def and_the_required_grade_is_updated_with(grade)
   end
 
   def then_the_start_page_should_show_the_selected_classification
-    expect(publish_degree_start_page.yes_radio).to be_checked
+    expect(publish_degree_start_page.radio_yes).to be_checked
   end
 
   def then_the_grade_page_should_show_the_selected_grade
@@ -232,7 +232,7 @@ def then_the_grade_page_should_show_the_selected_grade
   end
 
   def then_the_subject_requirements_page_should_show_the_requirements
-    expect(publish_degree_subject_requirement_page.yes_radio).to be_checked
+    expect(publish_degree_subject_requirement_page.radio_yes).to be_checked
     expect(publish_degree_subject_requirement_page.requirements.value).to eq('Maths A Level')
   end
 
diff --git a/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb b/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb
index 0a3ee58466..0df9a9dbea 100644
--- a/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb
+++ b/spec/support/page_objects/publish/courses/edit_engineers_teach_physics.rb
@@ -8,7 +8,7 @@ class EditEngineersTeachPhysics < PageObjects::Base
 
         section :campaign_fields, '[data-qa="course__engineers_teach_physics_radio_group"]' do
           element :engineers_teach_physics, '[data-qa="course__campaign_name_engineers_teach_physics_radio"]'
-          element :no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]'
+          element :selected_no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]'
         end
 
         element :continue, '[data-qa="course__save"]'
diff --git a/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb b/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb
index 155d958178..953fb9d302 100644
--- a/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb
+++ b/spec/support/page_objects/publish/courses/new_engineers_teach_physics.rb
@@ -8,7 +8,7 @@ class NewEngineersTeachPhysics < PageObjects::Base
 
         section :campaign_fields, '[data-qa="course__engineers_teach_physics_radio_group"]' do
           element :engineers_teach_physics, '[data-qa="course__campaign_name_engineers_teach_physics_radio"]'
-          element :no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]'
+          element :selected_no_campaign, '[data-qa="course__campaign_name_no_campaign_radio"]'
         end
 
         element :continue, '[data-qa="course__save"]'
diff --git a/spec/support/page_objects/publish/degree_start.rb b/spec/support/page_objects/publish/degree_start.rb
index ef0dbbda3c..f0e7f76c77 100644
--- a/spec/support/page_objects/publish/degree_start.rb
+++ b/spec/support/page_objects/publish/degree_start.rb
@@ -9,8 +9,8 @@ class DegreeStart < PageObjects::Base
 
       sections :errors, Sections::ErrorLink, '.govuk-error-summary__list li>a'
 
-      element :yes_radio, '[data-qa="start__yes_radio"]'
-      element :no_radio, '[data-qa="start__no_radio"]'
+      element :radio_yes, '[data-qa="start__yes_radio"]'
+      element :radio_no, '[data-qa="start__no_radio"]'
 
       element :submit, 'button.govuk-button[type="submit"]'
 
diff --git a/spec/support/page_objects/publish/degree_subject_requirement.rb b/spec/support/page_objects/publish/degree_subject_requirement.rb
index 0f7bcf83a8..b2b236fecb 100644
--- a/spec/support/page_objects/publish/degree_subject_requirement.rb
+++ b/spec/support/page_objects/publish/degree_subject_requirement.rb
@@ -11,8 +11,8 @@ class DegreeSubjectRequirement < PageObjects::Base
       sections :errors, Sections::ErrorLink, '.govuk-error-summary__list li>a'
 
       element :copy_content_warning, '[data-qa="copy-course-warning"]'
-      element :yes_radio, '[data-qa="degree_subject_requirements__yes_radio"]'
-      element :no_radio, '[data-qa="degree_subject_requirements__no_radio"]'
+      element :radio_yes, '[data-qa="degree_subject_requirements__yes_radio"]'
+      element :radio_no, '[data-qa="degree_subject_requirements__no_radio"]'
       element :requirements, '[data-qa="degree_subject_requirements__requirements"]'
       element :use_content, '[data-qa="course__use_content"]'