From 3973cd7d5ff3d0a68e6b49bdb036d677db923ab5 Mon Sep 17 00:00:00 2001
From: Kevin Dew <kevindew@me.com>
Date: Thu, 18 Jun 2020 19:46:40 +0100
Subject: [PATCH] Replace render_content_for for text content

This sets all of these scenarios of setting text content to use the
text_for helper method.
---
 .../additional_commodity_code.erb                    |  4 ++--
 .../outcomes/commodity_code_result.erb               |  2 +-
 .../questions/how_much_milk_fat.erb                  |  4 ++--
 .../questions/how_much_milk_protein_ab.erb           |  4 ++--
 .../questions/how_much_milk_protein_c.erb            |  4 ++--
 .../questions/how_much_milk_protein_d.erb            |  4 ++--
 .../questions/how_much_milk_protein_ef.erb           |  4 ++--
 .../questions/how_much_milk_protein_gh.erb           |  4 ++--
 .../questions/how_much_starch_glucose.erb            |  4 ++--
 .../questions/how_much_sucrose_1.erb                 |  4 ++--
 .../questions/how_much_sucrose_2.erb                 |  4 ++--
 .../questions/how_much_sucrose_3.erb                 |  4 ++--
 .../questions/how_much_sucrose_4.erb                 |  4 ++--
 .../am_i_getting_minimum_wage.erb                    |  4 ++--
 .../questions/are_you_an_apprentice.erb              |  4 ++--
 .../questions/current_accommodation_charge.erb       |  6 +++---
 .../questions/current_accommodation_usage.erb        |  6 +++---
 .../current_additional_work_outside_shift.erb        |  4 ++--
 .../current_paid_for_work_outside_shift.erb          |  2 +-
 .../did_employer_charge_for_job_requirements.erb     |  4 ++--
 .../does_employer_charge_for_job_requirements.erb    |  4 ++--
 .../questions/how_many_hours_did_you_work.erb        |  8 ++++----
 .../questions/how_many_hours_do_you_work.erb         |  8 ++++----
 .../how_much_are_you_paid_during_pay_period.erb      |  6 +++---
 .../how_much_were_you_paid_during_pay_period.erb     |  6 +++---
 .../questions/how_often_did_you_get_paid.erb         |  6 +++---
 .../questions/how_often_do_you_get_paid.erb          |  6 +++---
 .../questions/how_old_are_you.erb                    |  8 ++++----
 .../questions/how_old_were_you.erb                   |  6 +++---
 .../questions/is_provided_with_accommodation.erb     |  2 +-
 .../questions/past_accommodation_charge.erb          |  6 +++---
 .../questions/past_accommodation_usage.erb           |  6 +++---
 .../questions/past_additional_work_outside_shift.erb |  4 ++--
 .../questions/past_paid_for_work_outside_shift.erb   |  2 +-
 .../questions/was_provided_with_accommodation.erb    |  2 +-
 .../questions/were_you_an_apprentice.erb             |  4 ++--
 .../questions/what_would_you_like_to_check.erb       |  2 +-
 .../benefit_cap_calculator.erb                       |  4 ++--
 .../outcomes/outcome_affected_greater_than_cap.erb   |  2 +-
 .../outcome_affected_greater_than_cap_london.erb     |  2 +-
 .../outcome_affected_greater_than_cap_national.erb   |  2 +-
 .../outcomes/outcome_not_affected_exemptions.erb     |  2 +-
 .../outcome_not_affected_exemptions_future.erb       |  2 +-
 .../outcomes/outcome_not_affected_less_than_cap.erb  |  2 +-
 .../outcome_not_affected_less_than_cap_london.erb    |  2 +-
 .../outcome_not_affected_less_than_cap_national.erb  |  2 +-
 .../outcome_not_affected_no_housing_benefit.erb      |  2 +-
 ...utcome_not_affected_no_housing_benefit_future.erb |  2 +-
 .../benefit-cap-calculator/questions/_hints.erb      |  2 +-
 .../questions/bereavement_amount.erb                 |  2 +-
 .../questions/carers_amount.erb                      |  2 +-
 .../questions/child_benefit_amount.erb               |  2 +-
 .../questions/child_tax_amount.erb                   |  2 +-
 .../questions/enter_postcode.erb                     |  8 ++++----
 .../benefit-cap-calculator/questions/esa_amount.erb  |  2 +-
 .../questions/guardian_amount.erb                    |  2 +-
 .../questions/housing_benefit_amount.erb             |  2 +-
 .../questions/incapacity_amount.erb                  |  2 +-
 .../questions/income_support_amount.erb              |  2 +-
 .../benefit-cap-calculator/questions/jsa_amount.erb  |  2 +-
 .../questions/maternity_amount.erb                   |  2 +-
 .../questions/receive_housing_benefit.erb            |  2 +-
 .../questions/receiving_exemption_benefits.erb       |  4 ++--
 .../questions/receiving_non_exemption_benefits.erb   |  4 ++--
 .../benefit-cap-calculator/questions/sda_amount.erb  |  2 +-
 .../questions/single_couple_lone_parent.erb          |  2 +-
 .../questions/widow_pension_amount.erb               |  2 +-
 .../questions/widowed_mother_amount.erb              |  2 +-
 .../questions/widowed_parent_amount.erb              |  2 +-
 .../questions/widows_aged_amount.erb                 |  2 +-
 .../questions/working_tax_credit.erb                 |  4 ++--
 .../business_coronavirus_support_finder.erb          |  4 ++--
 .../outcomes/results.erb                             |  2 +-
 .../questions/annual_turnover.erb                    |  2 +-
 .../questions/business_based.erb                     |  2 +-
 .../questions/business_size.erb                      |  2 +-
 .../questions/non_domestic_property.erb              |  4 ++--
 .../questions/paye_scheme.erb                        |  2 +-
 .../questions/rate_relief_march_2020.erb             |  2 +-
 .../questions/sectors.erb                            |  2 +-
 .../questions/self_assessment_july_2020.erb          |  2 +-
 .../questions/self_employed.erb                      |  4 ++--
 .../questions/what_size_was_your_business.erb        |  2 +-
 .../questions/where_is_your_business_based.erb       |  2 +-
 .../calculate_agricultural_holiday_entitlement.erb   |  4 ++--
 .../outcomes/done.erb                                |  2 +-
 .../outcomes/done_with_number_formatting.erb         |  2 +-
 .../questions/how_many_days_per_week.erb             |  2 +-
 .../questions/how_many_total_days.erb                |  6 +++---
 .../questions/how_many_weeks_at_current_employer.erb |  6 +++---
 .../questions/what_date_does_holiday_start.erb       |  4 ++--
 .../work_the_same_number_of_days_each_week.erb       |  2 +-
 .../questions/worked_for_same_employer.erb           |  2 +-
 .../calculate_employee_redundancy_pay.erb            |  4 ++--
 .../outcomes/done.erb                                |  2 +-
 .../outcomes/done_no_statutory.erb                   |  2 +-
 .../questions/age_of_employee.erb                    |  6 +++---
 .../questions/date_of_redundancy.erb                 |  4 ++--
 .../questions/weekly_pay_before_tax.erb              |  8 ++++----
 .../questions/years_employed.erb                     |  6 +++---
 .../calculate_married_couples_allowance.erb          |  4 ++--
 .../outcomes/highest_earner_done.erb                 |  2 +-
 .../outcomes/husband_done.erb                        |  2 +-
 .../outcomes/sorry.erb                               |  2 +-
 ...marry_or_civil_partner_before_5_december_2005.erb |  6 +++---
 .../how_much_expected_contributions_before_tax.erb   |  6 +++---
 ...w_much_expected_contributions_with_tax_relief.erb |  6 +++---
 .../how_much_expected_gift_aided_donations.erb       |  6 +++---
 .../questions/paying_into_a_pension.erb              |  2 +-
 ...r_your_partner_born_on_or_before_6_april_1935.erb |  6 +++---
 .../whats_the_highest_earners_date_of_birth.erb      |  6 +++---
 .../questions/whats_the_highest_earners_income.erb   |  6 +++---
 .../questions/whats_the_husbands_date_of_birth.erb   |  6 +++---
 .../questions/whats_the_husbands_income.erb          |  6 +++---
 .../calculate_statutory_sick_pay.erb                 |  4 ++--
 .../contractual_days_covered_by_earnings.erb         |  6 +++---
 .../questions/coronavirus_gp_letter.erb              |  2 +-
 .../questions/coronavirus_related.erb                |  2 +-
 .../questions/coronavirus_self_or_cohabitant.erb     |  2 +-
 .../questions/days_covered_by_earnings.erb           |  4 ++--
 .../questions/employee_tell_within_limit.erb         |  2 +-
 .../questions/employee_work_different_days.erb       |  2 +-
 .../questions/first_sick_day.erb                     |  4 ++--
 .../questions/has_linked_sickness.erb                |  2 +-
 .../how_often_pay_employee_pay_patterns.erb          |  2 +-
 .../questions/is_your_employee_getting.erb           |  4 ++--
 .../questions/last_payday_before_offset.erb          |  4 ++--
 .../questions/last_payday_before_sickness.erb        |  6 +++---
 .../questions/last_sick_day.erb                      |  6 +++---
 .../questions/linked_sickness_end_date.erb           |  8 ++++----
 .../questions/linked_sickness_start_date.erb         |  4 ++--
 .../questions/paid_at_least_8_weeks.erb              |  2 +-
 .../questions/pay_amount_if_not_sick.erb             |  2 +-
 .../questions/total_earnings_before_sick_period.erb  |  2 +-
 .../questions/total_employee_earnings.erb            |  4 ++--
 .../questions/usual_work_days.erb                    |  2 +-
 .../calculate_your_holiday_entitlement.erb           |  4 ++--
 .../questions/basis_of_calculation.erb               |  4 ++--
 .../questions/calculation_period.erb                 |  2 +-
 .../compressed_hours_how_many_days_per_week.erb      |  6 +++---
 .../compressed_hours_how_many_hours_per_week.erb     |  6 +++---
 .../questions/how_many_days_per_week.erb             |  6 +++---
 .../questions/how_many_days_per_week_for_hours.erb   |  8 ++++----
 .../questions/how_many_hours_per_week.erb            |  8 ++++----
 .../questions/shift_worker_basis.erb                 |  2 +-
 .../shift_worker_days_per_shift_pattern.erb          |  8 ++++----
 .../questions/shift_worker_hours_per_shift.erb       |  8 ++++----
 .../shift_worker_shifts_per_shift_pattern.erb        |  6 +++---
 .../questions/what_is_your_leaving_date.erb          |  6 +++---
 .../questions/what_is_your_starting_date.erb         |  2 +-
 .../questions/when_does_your_leave_year_start.erb    | 12 ++++++------
 .../calculate_your_redundancy_pay.erb                |  4 ++--
 .../calculate-your-redundancy-pay/outcomes/done.erb  |  2 +-
 .../outcomes/done_no_statutory.erb                   |  2 +-
 .../questions/age_of_employee.erb                    |  4 ++--
 .../questions/date_of_redundancy.erb                 |  4 ++--
 .../questions/weekly_pay_before_tax.erb              |  8 ++++----
 .../questions/years_employed.erb                     |  6 +++---
 .../check-uk-visa/check_uk_visa.erb                  |  4 ++--
 .../outcomes/outcome_diplomatic_business.erb         |  2 +-
 .../outcomes/outcome_joining_family_m.erb            |  2 +-
 .../outcomes/outcome_joining_family_nvn.erb          |  2 +-
 .../outcome_marriage_electronic_visa_waiver.erb      |  2 +-
 .../outcomes/outcome_marriage_nvn_ukot.erb           |  2 +-
 .../outcomes/outcome_marriage_taiwan.erb             |  2 +-
 .../outcomes/outcome_marriage_visa_nat_datv.erb      |  2 +-
 .../check-uk-visa/outcomes/outcome_medical_n.erb     |  2 +-
 .../check-uk-visa/outcomes/outcome_medical_y.erb     |  2 +-
 .../outcomes/outcome_no_visa_needed.erb              |  2 +-
 .../outcome_partner_family_british_citizen_y.erb     |  2 +-
 .../outcomes/outcome_partner_family_eea_n.erb        |  2 +-
 .../outcomes/outcome_partner_family_eea_y.erb        |  2 +-
 .../check-uk-visa/outcomes/outcome_school_n.erb      |  2 +-
 .../check-uk-visa/outcomes/outcome_school_waiver.erb |  2 +-
 .../check-uk-visa/outcomes/outcome_school_y.erb      |  2 +-
 .../outcomes/outcome_standard_visitor_visa.erb       |  2 +-
 .../check-uk-visa/outcomes/outcome_study_m.erb       |  2 +-
 .../check-uk-visa/outcomes/outcome_study_waiver.erb  |  2 +-
 .../outcomes/outcome_study_waiver_taiwan.erb         |  2 +-
 .../check-uk-visa/outcomes/outcome_study_y.erb       |  2 +-
 .../outcomes/outcome_tourism_visa_partner.erb        |  2 +-
 .../outcomes/outcome_transit_datv_exception.erb      |  2 +-
 .../outcomes/outcome_transit_leaving_airport.erb     |  2 +-
 .../outcome_transit_leaving_airport_datv.erb         |  2 +-
 .../outcomes/outcome_transit_not_leaving_airport.erb |  2 +-
 .../outcome_transit_refugee_not_leaving_airport.erb  |  2 +-
 .../outcomes/outcome_transit_taiwan.erb              |  2 +-
 ...outcome_transit_taiwan_through_border_control.erb |  2 +-
 .../outcome_transit_to_the_republic_of_ireland.erb   |  2 +-
 .../outcomes/outcome_transit_venezuela.erb           |  2 +-
 .../check-uk-visa/outcomes/outcome_visit_waiver.erb  |  2 +-
 .../outcomes/outcome_visit_waiver_taiwan.erb         |  2 +-
 .../check-uk-visa/outcomes/outcome_work_m.erb        |  2 +-
 .../check-uk-visa/outcomes/outcome_work_n.erb        |  2 +-
 .../check-uk-visa/outcomes/outcome_work_waiver.erb   |  2 +-
 .../check-uk-visa/outcomes/outcome_work_y.erb        |  2 +-
 .../check-uk-visa/questions/article_10_card.erb      |  2 +-
 .../questions/channel_islands_or_isle_of_man.erb     |  2 +-
 .../questions/israeli_document_type.erb              |  2 +-
 .../questions/partner_family_british_citizen.erb     |  2 +-
 .../check-uk-visa/questions/partner_family_eea.erb   |  2 +-
 .../questions/passing_through_uk_border_control.erb  |  2 +-
 .../check-uk-visa/questions/purpose_of_visit.erb     |  2 +-
 .../check-uk-visa/questions/staying_for_how_long.erb |  2 +-
 .../check-uk-visa/questions/travelling_to_cta.erb    |  2 +-
 .../travelling_visiting_partner_family_member.erb    |  2 +-
 .../questions/what_passport_do_you_have.erb          |  4 ++--
 .../questions/what_sort_of_passport.erb              |  2 +-
 .../questions/what_sort_of_travel_document.erb       |  2 +-
 .../childcare_costs_for_tax_credits.erb              |  4 ++--
 .../outcomes/call_helpline_detailed.erb              |  2 +-
 .../outcomes/call_helpline_plain.erb                 |  2 +-
 .../outcomes/cost_changed.erb                        |  2 +-
 .../outcomes/no_change.erb                           |  2 +-
 .../outcomes/no_longer_paying.erb                    |  2 +-
 .../outcomes/round_up_weekly.erb                     |  2 +-
 .../outcomes/weekly_costs_are_x.erb                  |  2 +-
 .../questions/currently_claiming.erb                 |  2 +-
 .../questions/have_costs_changed.erb                 |  2 +-
 .../questions/how_much_12_months_1.erb               |  4 ++--
 .../questions/how_much_12_months_2.erb               |  2 +-
 .../questions/how_much_4_weeks.erb                   |  2 +-
 .../questions/how_much_52_weeks_1.erb                |  4 ++--
 .../questions/how_much_52_weeks_2.erb                |  2 +-
 .../questions/how_much_each_month.erb                |  2 +-
 .../questions/how_much_fortnightly.erb               |  2 +-
 .../questions/how_much_spent_last_12_months.erb      |  4 ++--
 .../questions/how_much_yearly.erb                    |  2 +-
 .../questions/how_often_pay_1.erb                    |  2 +-
 .../questions/how_often_pay_2.erb                    |  2 +-
 .../questions/how_often_pay_providers.erb            |  2 +-
 .../questions/how_often_use_childcare.erb            |  2 +-
 .../questions/new_monthly_cost.erb                   |  2 +-
 .../questions/new_weekly_costs.erb                   |  4 ++--
 .../questions/old_monthly_amount.erb                 |  4 ++--
 .../questions/old_weekly_amount_1.erb                |  4 ++--
 .../questions/old_weekly_amount_2.erb                |  4 ++--
 .../questions/pay_same_each_time.erb                 |  4 ++--
 .../coronavirus_employee_risk_assessment.erb         |  2 +-
 .../outcomes/go_back_to_work.erb                     |  2 +-
 .../outcomes/you_should_not_be_going_to_work.erb     |  2 +-
 .../questions/are_you_shielding.erb                  |  2 +-
 .../questions/are_you_vulnerable.erb                 |  2 +-
 .../questions/can_work_from_home.erb                 |  2 +-
 .../do_you_live_with_someone_vulnerable.erb          |  2 +-
 .../questions/have_childcare_responsibility.erb      |  2 +-
 .../is_your_employer_asking_you_to_work.erb          |  2 +-
 .../questions/is_your_workplace_an_auction_house.erb |  2 +-
 .../questions/is_your_workplace_an_exception.erb     |  2 +-
 .../questions/where_do_you_work.erb                  |  2 +-
 .../estimate_self_assessment_penalties.erb           |  4 ++--
 .../outcomes/filed_and_paid_on_time.erb              |  2 +-
 .../outcomes/late.erb                                |  2 +-
 .../questions/how_much_tax.erb                       |  6 +++---
 .../questions/how_submitted.erb                      |  2 +-
 .../questions/when_paid.erb                          |  6 +++---
 .../questions/when_submitted.erb                     |  6 +++---
 .../questions/which_year.erb                         |  2 +-
 .../help_if_you_are_arrested_abroad.erb              |  4 ++--
 .../outcomes/answer_one_generic.erb                  |  2 +-
 .../answer_three_british_overseas_territories.erb    |  2 +-
 .../questions/which_country.erb                      |  2 +-
 .../inherits_someone_dies_without_will.erb           |  4 ++--
 .../outcomes/outcome_1.erb                           |  2 +-
 .../outcomes/outcome_2.erb                           |  2 +-
 .../outcomes/outcome_20.erb                          |  2 +-
 .../outcomes/outcome_23.erb                          |  2 +-
 .../outcomes/outcome_24.erb                          |  2 +-
 .../outcomes/outcome_25.erb                          |  2 +-
 .../outcomes/outcome_3.erb                           |  2 +-
 .../outcomes/outcome_4.erb                           |  2 +-
 .../outcomes/outcome_40.erb                          |  2 +-
 .../outcomes/outcome_41.erb                          |  2 +-
 .../outcomes/outcome_42.erb                          |  2 +-
 .../outcomes/outcome_43.erb                          |  2 +-
 .../outcomes/outcome_44.erb                          |  2 +-
 .../outcomes/outcome_45.erb                          |  2 +-
 .../outcomes/outcome_46.erb                          |  2 +-
 .../outcomes/outcome_5.erb                           |  2 +-
 .../outcomes/outcome_6.erb                           |  2 +-
 .../outcomes/outcome_60.erb                          |  2 +-
 .../outcomes/outcome_61.erb                          |  2 +-
 .../outcomes/outcome_62.erb                          |  2 +-
 .../outcomes/outcome_63.erb                          |  2 +-
 .../outcomes/outcome_64.erb                          |  2 +-
 .../outcomes/outcome_65.erb                          |  2 +-
 .../outcomes/outcome_66.erb                          |  2 +-
 .../outcomes/outcome_67.erb                          |  2 +-
 .../questions/aunts_or_uncles.erb                    |  2 +-
 .../questions/children.erb                           |  4 ++--
 .../questions/estate_over_250000.erb                 |  2 +-
 .../questions/estate_over_270000.erb                 |  2 +-
 .../questions/grandparents.erb                       |  2 +-
 .../questions/great_aunts_or_uncles.erb              |  4 ++--
 .../questions/half_aunts_or_uncles.erb               |  2 +-
 .../questions/half_siblings.erb                      |  2 +-
 .../questions/more_than_one_child.erb                |  2 +-
 .../questions/parents.erb                            |  2 +-
 .../questions/partner.erb                            |  4 ++--
 .../questions/region.erb                             |  2 +-
 .../questions/siblings.erb                           |  2 +-
 .../questions/siblings_including_mixed_parents.erb   |  2 +-
 .../landlord_immigration_check.erb                   |  4 ++--
 .../questions/family_permit.erb                      |  2 +-
 .../questions/has_documents.erb                      |  2 +-
 .../questions/has_eu_documents.erb                   |  4 ++--
 .../questions/has_other_documents.erb                |  2 +-
 ..._residence_card_or_eu_eea_swiss_family_member.erb |  2 +-
 .../questions/has_uk_passport.erb                    |  2 +-
 .../questions/immigration_application.erb            |  2 +-
 .../questions/main_home.erb                          |  2 +-
 .../questions/property.erb                           |  8 ++++----
 .../questions/property_type.erb                      |  2 +-
 .../questions/tenant_over_18.erb                     |  2 +-
 .../questions/time_limited_to_remain.erb             |  2 +-
 .../questions/waiting_for_documents.erb              |  2 +-
 .../questions/what_nationality.erb                   |  2 +-
 .../marriage-abroad/marriage_abroad.erb              |  4 ++--
 .../outcomes/countries/china/_title.erb              |  2 +-
 .../outcomes/countries/colombia/_title.erb           |  2 +-
 .../outcomes/countries/croatia/_title.erb            |  2 +-
 .../outcomes/countries/finland/_title.erb            |  2 +-
 .../outcomes/countries/france/_title.erb             |  2 +-
 .../outcomes/countries/germany/_title.erb            |  2 +-
 .../outcomes/countries/iceland/_title.erb            |  2 +-
 .../outcomes/countries/iran/_title.erb               |  2 +-
 .../outcomes/countries/jordan/_title.erb             |  2 +-
 .../outcomes/countries/latvia/_title.erb             |  2 +-
 .../outcomes/countries/mozambique/_title.erb         |  2 +-
 .../outcomes/countries/philippines/_title.erb        |  2 +-
 .../outcomes/countries/poland/_title.erb             |  2 +-
 .../outcomes/countries/portugal/_title.erb           |  2 +-
 .../outcomes/countries/romania/_title.erb            |  2 +-
 .../outcomes/countries/thailand/_title.erb           |  2 +-
 .../outcomes/countries/turkey/_title.erb             |  2 +-
 .../outcomes/countries/usa/_title.erb                |  2 +-
 .../outcomes/countries/vietnam/_title.erb            |  2 +-
 .../outcomes/outcome_marriage_abroad_in_country.erb  |  2 +-
 .../questions/country_of_ceremony.erb                |  2 +-
 .../marriage-abroad/questions/legal_residency.erb    |  2 +-
 .../marriage-abroad/questions/marriage_or_pacs.erb   |  4 ++--
 .../questions/partner_opposite_or_same_sex.erb       |  2 +-
 .../questions/what_is_your_partners_nationality.erb  |  2 +-
 .../maternity_paternity_calculator.erb               |  4 ++--
 .../questions/_earnings_question_error_message.erb   |  2 +-
 .../questions/adoption_date_leave_starts.erb         |  8 ++++----
 .../adoption_did_the_employee_work_for_you.erb       |  2 +-
 .../questions/adoption_employment_contract.erb       |  2 +-
 .../questions/adoption_is_from_overseas.erb          |  2 +-
 .../adoption_is_the_employee_on_your_payroll.erb     |  2 +-
 .../questions/baby_birth_date_paternity.erb          |  4 ++--
 .../questions/baby_due_date_maternity.erb            |  2 +-
 .../questions/baby_due_date_paternity.erb            |  2 +-
 .../questions/date_leave_starts.erb                  |  6 +++---
 .../questions/date_of_adoption_match.erb             |  4 ++--
 .../questions/date_of_adoption_placement.erb         |  4 ++--
 .../questions/day_of_the_month_paternity.erb         |  2 +-
 .../questions/days_of_the_week_paternity.erb         |  2 +-
 .../questions/did_the_employee_work_for_you.erb      |  2 +-
 .../did_the_employee_work_for_you_between.erb        |  2 +-
 .../questions/does_the_employee_work_for_you_now.erb |  4 ++--
 .../questions/earnings_for_pay_period.erb            |  4 ++--
 .../questions/earnings_for_pay_period_adoption.erb   |  4 ++--
 .../questions/earnings_for_pay_period_paternity.erb  |  4 ++--
 .../employee_date_matched_paternity_adoption.erb     |  2 +-
 .../questions/employee_has_contract_paternity.erb    |  2 +-
 .../questions/employee_on_payroll_paternity.erb      |  2 +-
 .../questions/employee_paternity_length.erb          |  2 +-
 .../employee_responsible_for_upbringing.erb          |  2 +-
 .../questions/employee_start_paternity.erb           |  4 ++--
 .../employee_still_employed_on_birth_date.erb        |  2 +-
 .../employee_work_before_employment_start.erb        |  2 +-
 .../questions/employment_contract.erb                |  2 +-
 .../questions/how_do_you_want_the_sap_calculated.erb |  2 +-
 .../questions/how_do_you_want_the_smp_calculated.erb |  2 +-
 .../questions/how_do_you_want_the_spp_calculated.erb |  2 +-
 .../questions/how_many_payments_every_2_weeks.erb    |  2 +-
 .../questions/how_many_payments_every_4_weeks.erb    |  2 +-
 .../questions/how_many_payments_monthly.erb          |  4 ++--
 .../questions/how_many_payments_weekly.erb           |  4 ++--
 .../questions/is_the_employee_on_your_payroll.erb    |  2 +-
 .../questions/last_normal_payday.erb                 |  6 +++---
 .../questions/last_normal_payday_adoption.erb        |  6 +++---
 .../questions/last_normal_payday_paternity.erb       |  6 +++---
 .../questions/leave_or_pay_for_adoption.erb          |  2 +-
 .../questions/monthly_pay_paternity.erb              |  4 ++--
 .../questions/next_pay_day_paternity.erb             |  2 +-
 .../padoption_date_of_adoption_placement.erb         |  4 ++--
 ...padoption_employee_responsible_for_upbringing.erb |  2 +-
 .../questions/pay_date_options_paternity.erb         |  2 +-
 .../questions/pay_frequency.erb                      |  2 +-
 .../questions/pay_frequency_adoption.erb             |  4 ++--
 .../questions/pay_frequency_paternity.erb            |  4 ++--
 .../questions/payday_eight_weeks.erb                 |  6 +++---
 .../questions/payday_eight_weeks_adoption.erb        |  6 +++---
 .../questions/payday_eight_weeks_paternity.erb       |  6 +++---
 .../questions/specific_date_each_month_paternity.erb |  6 +++---
 ...ing_paternity_or_maternity_leave_for_adoption.erb |  2 +-
 .../questions/what_days_does_the_employee_work.erb   |  2 +-
 ...ticular_day_of_the_month_is_the_employee_paid.erb |  2 +-
 ...specific_date_each_month_is_the_employee_paid.erb |  6 +++---
 .../questions/what_type_of_leave.erb                 |  2 +-
 .../when_in_the_month_is_the_employee_paid.erb       |  4 ++--
 .../when_is_your_employees_next_pay_day.erb          |  2 +-
 .../which_week_in_month_is_the_employee_paid.erb     |  2 +-
 .../minimum_wage_calculator_employers.erb            |  4 ++--
 .../questions/are_you_an_apprentice.erb              |  4 ++--
 .../questions/current_accommodation_charge.erb       |  4 ++--
 .../questions/current_accommodation_usage.erb        |  4 ++--
 .../current_additional_work_outside_shift.erb        |  4 ++--
 .../current_paid_for_work_outside_shift.erb          |  2 +-
 .../did_employer_charge_for_job_requirements.erb     |  4 ++--
 .../does_employer_charge_for_job_requirements.erb    |  4 ++--
 .../questions/how_many_hours_did_you_work.erb        |  8 ++++----
 .../questions/how_many_hours_do_you_work.erb         |  8 ++++----
 .../how_much_are_you_paid_during_pay_period.erb      |  6 +++---
 .../how_much_were_you_paid_during_pay_period.erb     |  6 +++---
 .../questions/how_often_did_you_get_paid.erb         |  6 +++---
 .../questions/how_often_do_you_get_paid.erb          |  6 +++---
 .../questions/how_old_are_you.erb                    |  6 +++---
 .../questions/how_old_were_you.erb                   |  6 +++---
 .../questions/is_provided_with_accommodation.erb     |  2 +-
 .../questions/past_accommodation_charge.erb          |  4 ++--
 .../questions/past_accommodation_usage.erb           |  4 ++--
 .../questions/past_additional_work_outside_shift.erb |  4 ++--
 .../questions/past_paid_for_work_outside_shift.erb   |  2 +-
 .../questions/was_provided_with_accommodation.erb    |  2 +-
 .../questions/were_you_an_apprentice.erb             |  4 ++--
 .../questions/what_would_you_like_to_check.erb       |  2 +-
 .../part_year_profit_tax_credits.erb                 |  4 ++--
 ...t_trading_before_the_relevant_accounting_year.erb |  4 ++--
 .../do_your_accounts_cover_a_12_month_period.erb     |  4 ++--
 .../questions/have_you_stopped_trading.erb           |  6 +++---
 .../what_date_do_your_accounts_go_up_to.erb          |  6 +++---
 .../questions/what_is_your_taxable_profit.erb        |  6 +++---
 .../questions/when_did_you_start_trading.erb         |  8 ++++----
 .../questions/when_did_you_stop_trading.erb          |  8 ++++----
 .../when_did_your_tax_credits_award_end.erb          |  6 +++---
 .../pay-leave-for-parents/pay_leave_for_parents.erb  |  4 ++--
 .../questions/_warning_hint.erb                      |  2 +-
 .../pay-leave-for-parents/questions/due_date.erb     |  2 +-
 .../questions/employment_status_of_mother.erb        |  2 +-
 .../questions/employment_status_of_partner.erb       |  2 +-
 .../questions/mother_earned_at_least_390.erb         |  2 +-
 .../mother_earned_more_than_lower_earnings_limit.erb |  2 +-
 ..._started_working_before_continuity_start_date.erb |  2 +-
 .../mother_still_working_on_continuity_end_date.erb  |  2 +-
 .../questions/mother_worked_at_least_26_weeks.erb    |  2 +-
 .../questions/partner_earned_at_least_390.erb        |  2 +-
 ...partner_earned_more_than_lower_earnings_limit.erb |  2 +-
 ..._started_working_before_continuity_start_date.erb |  2 +-
 .../partner_still_working_on_continuity_end_date.erb |  2 +-
 .../questions/partner_worked_at_least_26_weeks.erb   |  2 +-
 .../pay-leave-for-parents/questions/two_carers.erb   |  2 +-
 .../outcomes/adoption_leave_details.erb              |  2 +-
 .../plan-adoption-leave/plan_adoption_leave.erb      |  4 ++--
 .../questions/child_arrival_date.erb                 |  6 +++---
 .../questions/child_match_date.erb                   |  2 +-
 .../plan-adoption-leave/questions/leave_start.erb    |  6 +++---
 .../plan-adoption-leave/questions/meta.erb           |  2 +-
 .../questions/childs_date_of_birth.erb               |  2 +-
 .../register-a-birth/questions/country_of_birth.erb  |  2 +-
 .../questions/have_you_adopted_the_child.erb         |  2 +-
 .../married_couple_or_civil_partnership.erb          |  2 +-
 .../register-a-birth/questions/where_are_you_now.erb |  2 +-
 .../register-a-birth/questions/which_country.erb     |  2 +-
 .../questions/who_has_british_nationality.erb        |  2 +-
 .../register-a-birth/register_a_birth.erb            |  4 ++--
 .../did_the_person_die_at_home_hospital.erb          |  2 +-
 .../questions/was_death_expected.erb                 |  2 +-
 .../register-a-death/questions/where_are_you_now.erb |  2 +-
 .../questions/where_did_the_death_happen.erb         |  2 +-
 .../register-a-death/questions/which_country.erb     |  2 +-
 .../questions/which_country_are_you_in_now.erb       |  2 +-
 .../register-a-death/register_a_death.erb            |  4 ++--
 .../outcomes/contact_the_embassy.erb                 |  2 +-
 .../where_was_the_passport_lost_or_stolen.erb        |  2 +-
 .../questions/which_country.erb                      |  2 +-
 .../report_a_lost_or_stolen_passport.erb             |  4 ++--
 .../questions/buying_new_vehicle.erb                 |  2 +-
 .../questions/capital_allowances.erb                 |  2 +-
 .../questions/car_status_before_usage.erb            |  2 +-
 .../claimed_expenses_for_current_business.erb        |  4 ++--
 .../questions/current_claim_amount_home.erb          |  4 ++--
 .../questions/deduct_from_premises.erb               |  4 ++--
 .../questions/drive_business_miles_car_van.erb       |  2 +-
 .../questions/drive_business_miles_motorcycle.erb    |  2 +-
 .../questions/home_or_business_premises_expense.erb  |  2 +-
 .../questions/hours_work_home.erb                    |  4 ++--
 .../questions/how_much_expect_to_claim.erb           |  4 ++--
 .../questions/is_vehicle_green.erb                   |  2 +-
 .../questions/people_live_on_premises.erb            |  4 ++--
 .../questions/price_of_vehicle.erb                   |  4 ++--
 .../questions/type_of_expense.erb                    |  6 +++---
 .../questions/vehicle_business_use_time.erb          |  6 +++---
 .../questions/vehicle_expense.erb                    |  2 +-
 .../simplified_expenses_checker.erb                  |  4 ++--
 .../state-pension-age/outcomes/bus_pass_result.erb   |  2 +-
 .../outcomes/has_reached_sp_age.erb                  |  2 +-
 .../outcomes/not_yet_reached_sp_age.erb              |  2 +-
 .../state-pension-age/questions/dob_age.erb          |  4 ++--
 .../state-pension-age/questions/gender.erb           |  2 +-
 .../questions/which_calculation.erb                  |  2 +-
 .../state-pension-age/state_pension_age.erb          |  4 ++--
 .../questions/what_is_your_gender.erb                |  2 +-
 .../questions/what_is_your_marital_status.erb        |  2 +-
 .../questions/when_will_you_reach_pension_age.erb    |  2 +-
 .../when_will_your_partner_reach_pension_age.erb     |  2 +-
 .../state_pension_through_partner.erb                |  4 ++--
 .../questions/are_you_a_doctor_or_dentist.erb        |  2 +-
 ...you_studying_dental_hygiene_or_dental_therapy.erb |  2 +-
 ...udying_one_of_these_dental_or_medical_courses.erb |  2 +-
 ...do_any_of_the_following_apply_all_uk_students.erb |  2 +-
 ...he_following_apply_uk_full_time_students_only.erb |  2 +-
 ...w_many_credits_does_a_full_time_student_study.erb |  6 +++---
 .../questions/how_many_credits_will_you_study.erb    |  6 +++---
 .../how_much_are_your_tuition_fees_per_year.erb      |  6 +++---
 .../questions/what_course_are_you_studying.erb       |  2 +-
 .../questions/what_type_of_student_are_you.erb       |  2 +-
 .../questions/whats_your_household_income.erb        |  6 +++---
 .../questions/when_does_your_course_start.erb        |  2 +-
 .../questions/where_will_you_live_while_studying.erb |  2 +-
 .../student_finance_calculator.erb                   |  4 ++--
 .../towing-rules/questions/bus_licenceholder.erb     |  2 +-
 .../questions/car_licence_before_jan_1997.erb        |  2 +-
 .../questions/date_licence_was_issued.erb            |  2 +-
 .../questions/date_licence_was_issued_msv.erb        |  2 +-
 .../do_you_have_lv_or_bus_towing_entitlement.erb     |  2 +-
 .../questions/existing_large_vehicle_licence.erb     |  2 +-
 .../existing_large_vehicle_towing_entitlements.erb   |  2 +-
 .../questions/existing_towing_entitlements.erb       |  2 +-
 .../towing-rules/questions/full_minibus_licence.erb  |  2 +-
 .../towing-rules/questions/how_long_entitlements.erb |  2 +-
 .../towing-rules/questions/how_old_are_you_bus.erb   |  2 +-
 .../towing-rules/questions/how_old_are_you_lv.erb    |  2 +-
 .../questions/how_old_are_you_minibus.erb            |  2 +-
 .../towing-rules/questions/how_old_are_you_msv.erb   |  2 +-
 .../towing-rules/questions/how_old_are_you_msv_2.erb |  2 +-
 .../questions/medium_sized_vehicle_licenceholder.erb |  2 +-
 .../towing-rules/questions/towing_vehicle_type.erb   |  2 +-
 lib/smart_answer_flows/towing-rules/towing_rules.erb |  4 ++--
 .../questions/db_claiming_benefits.erb               |  2 +-
 .../questions/db_how_long_abroad.erb                 |  2 +-
 .../questions/do_either_of_the_following_apply.erb   |  4 ++--
 .../questions/eligible_for_smp.erb                   |  2 +-
 .../questions/eligible_for_tax_credits.erb           |  4 ++--
 .../questions/employer_paying_ni.erb                 |  2 +-
 .../questions/esa_how_long_abroad.erb                |  2 +-
 .../questions/going_or_already_abroad.erb            |  2 +-
 .../questions/iidb_already_claiming.erb              |  2 +-
 .../questions/is_abroad_for_treatment.erb            |  2 +-
 .../questions/is_any_of_the_following_apply.erb      |  2 +-
 .../questions/is_claiming_benefits.erb               |  4 ++--
 .../questions/is_either_of_the_following.erb         |  4 ++--
 .../questions/is_how_long_abroad.erb                 |  4 ++--
 .../questions/is_work_or_sick_pay.erb                |  4 ++--
 .../questions/jsa_how_long_abroad.erb                |  2 +-
 .../questions/tax_credits_children.erb               |  2 +-
 .../questions/tax_credits_currently_claiming.erb     |  4 ++--
 .../questions/tax_credits_how_long_abroad.erb        |  2 +-
 .../questions/tax_credits_why_going_abroad.erb       |  2 +-
 .../uk-benefits-abroad/questions/which_benefit.erb   |  2 +-
 .../uk-benefits-abroad/questions/which_country.erb   |  2 +-
 .../questions/working_for_a_uk_employer.erb          |  2 +-
 .../questions/working_for_uk_employer_ssp.erb        |  2 +-
 .../uk-benefits-abroad/uk_benefits_abroad.erb        |  4 ++--
 .../outcomes/result_bacs_direct_credit.erb           |  2 +-
 .../outcomes/result_bank_giro.erb                    |  2 +-
 .../vat-payment-deadlines/outcomes/result_chaps.erb  |  2 +-
 .../vat-payment-deadlines/outcomes/result_cheque.erb |  2 +-
 .../outcomes/result_direct_debit.erb                 |  2 +-
 .../outcomes/result_online_debit_credit_card.erb     |  2 +-
 .../outcomes/result_online_telephone_banking.erb     |  2 +-
 .../questions/how_do_you_want_to_pay.erb             |  2 +-
 .../when_does_your_vat_accounting_period_end.erb     |  4 ++--
 .../vat-payment-deadlines/vat_payment_deadlines.erb  |  4 ++--
 576 files changed, 876 insertions(+), 876 deletions(-)

diff --git a/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.erb b/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.erb
index 8c5d779fc22..cbe39008455 100644
--- a/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/additional_commodity_code.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Look up Meursing code
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Look up the additional code (Meursing code) required for import or export of goods containing certain types of milk and sugars
 <% end %>
 
diff --git a/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.erb b/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.erb
index 9f0fb5e070a..4f919df4f92 100644
--- a/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% unless calculator.has_commodity_code? %>
     The product composition you indicated is not possible.
   <% else %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.erb
index 122c5a7805f..b862ea0e806 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_fat.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk fat does the product contain?
 <% end %>
 
@@ -17,6 +17,6 @@
   "85": "85 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.erb
index b8c4b0fbf6a..3cdcb9e5439 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ab.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk proteins does the product contain?
 <% end %>
 
@@ -11,6 +11,6 @@
   "60": "60 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.erb
index 4545289c4e0..7edb24ee969 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_c.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk proteins does the product contain?
 <% end %>
 
@@ -8,6 +8,6 @@
   "12": "12 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.erb
index 846d72ea88f..a0d6588b8c1 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_d.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk proteins does the product contain?
 <% end %>
 
@@ -8,6 +8,6 @@
   "15": "15 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.erb
index 01e7cb1f73e..55f6ab7aadf 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_ef.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk proteins does the product contain?
 <% end %>
 
@@ -8,6 +8,6 @@
   "18": "18 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.erb
index 6b5e2f85a33..964e6e02311 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_milk_protein_gh.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much milk proteins does the product contain?
 <% end %>
 
@@ -7,6 +7,6 @@
   "6": "6 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.erb
index 29db044abe7..bd88d546839 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_starch_glucose.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much starch or glucose does the product contain?
 <% end %>
 
@@ -10,6 +10,6 @@
   "75": "75 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.erb
index 2bc5e824cc2..e726b8fdd80 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_1.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much sucrose, invert sugar or isoglucose does the product contain?
 <% end %>
 
@@ -10,6 +10,6 @@
   "70": "70 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.erb
index 0ea3bc76381..c9489e68409 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_2.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much sucrose, invert sugar or isoglucose does the product contain?
 <% end %>
 
@@ -9,6 +9,6 @@
   "50": "50 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.erb
index a101a065d40..318fbdf8ed2 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_3.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much sucrose, invert sugar or isoglucose does the product contain?
 <% end %>
 
@@ -8,6 +8,6 @@
   "30": "30 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.erb b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.erb
index dc68519bca4..cce2137b6c2 100644
--- a/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.erb
+++ b/lib/smart_answer_flows/additional-commodity-code/questions/how_much_sucrose_4.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much sucrose, invert sugar or isoglucose does the product contain?
 <% end %>
 
@@ -7,6 +7,6 @@
   "5": "5 or more"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The values represent % by weight
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.erb
index e4d51c1516d..9163f845b2f 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/am_i_getting_minimum_wage.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   National Minimum Wage and Living Wage calculator for workers
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Check if your pay matches the National Minimum Wage, the National Living Wage or if your employer owes you payments from the previous year.
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.erb
index 81f8ce66d45..7d51a2a857f 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/are_you_an_apprentice.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you an apprentice?
 <% end %>
 
@@ -9,6 +9,6 @@
   "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in your second year or onwards"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you’re 19 or over and you’ve completed the first year of your apprenticeship, you’re not eligible for the apprenticeship National Minimum Wage rate. You should be paid the National Minimum Wage for your age.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.erb
index e615cc61799..11744d6e0c1 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_charge.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much does your employer charge for accommodation per day?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   per day
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.erb
index adeaa86cb2d..c9a9d503250 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_accommodation_usage.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days per week do you live in the accommodation?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   days per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   7 is the highest number of days you can enter.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.erb
index 497551515b2..1fafaed60d6 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_additional_work_outside_shift.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you work additional time outside your shift?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Additional time can be either starting early or finishing late outside your shift, for example attending a staff meeting or going through security checks.
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.erb
index 346c067966b..4b2534be0a6 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/current_paid_for_work_outside_shift.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does your employer pay you for any additional time you work outside of your shift?
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.erb
index cdd4fe12472..f88cbe5bc95 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/did_employer_charge_for_job_requirements.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did your employer take money from your pay for things you needed for your job?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is when you've bought items needed for work yourself and have not been reimbursed. Or if the cost has been deducted from your pay.
 
   Items include clothing, uniforms, tools or other equipment you need for your job.
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.erb
index e621093f746..606e9ccb398 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/does_employer_charge_for_job_requirements.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does your employer take money from your pay for things you need for your job?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is when you've bought items needed for work yourself and have not been reimbursed. Or if the cost has been deducted from your pay.
 
   Items include clothing, uniforms, tools or other equipment you need for your job.
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.erb
index 3b511c25b4f..2764a778d02 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_did_you_work.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours did you work during the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 This includes any time you were at work and needed to be available for work or any time spent travelling in connection with work (for example, travelling to a training course or between work locations). Do not include overtime or time taken to travel to your normal workplace.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
-<% render_content_for :error_hours do %>
+<% text_for :error_hours do %>
   Please enter the number of hours you actually worked during the pay period.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.erb
index d7c5e3ad6ba..86211046bf5 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_many_hours_do_you_work.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours do you work during the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 This includes any time you’re at work and need to be available for work or any time spent travelling in connection with work (for example, travelling to a training course or between work locations). Do not include overtime or time taken to travel to your normal workplace.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
-<% render_content_for :error_hours do %>
+<% text_for :error_hours do %>
   Please enter the number of hours you actually work during the pay period.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.erb
index 43241c0772b..e39276965f3 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_are_you_paid_during_pay_period.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you get paid before tax in the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 Do not include payments for overtime or anything extra to your pay, for example money for clothes or goods.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.erb
index 3bc9da0fcb8..c5072a5145a 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_much_were_you_paid_during_pay_period.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much were you paid in the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Do not include tips, overtime or anything else on top of your pay, for example money for clothes or goods.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.erb
index 95d347ee026..2576f76e3df 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_did_you_get_paid.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often did you get paid?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Your pay period in days
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.erb
index a1eb70d7f96..540f8253106 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_often_do_you_get_paid.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you get paid?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Your pay period in days
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.erb
index c6eb2ae3055..f1a4edeeb65 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_are_you.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= age_title %>
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   years old
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a whole number greater than 0
 <% end %>
 
-<% render_content_for :error_valid_age_for_living_wage? do %>
+<% text_for :error_valid_age_for_living_wage? do %>
   You must be 25 or over to get the National Living Wage
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.erb
index 55a1dd77e1e..c720e31fa65 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/how_old_were_you.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old were you at the time?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   years old
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a whole number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.erb
index 8a3281a40d0..0db86ad30c8 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/is_provided_with_accommodation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does your employer provide you with accommodation?
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.erb
index 3d1b9368a45..0e338a344cb 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_charge.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much did your employer charge for accommodation per day?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   per day
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.erb
index eceaf2db1d0..8d5dbc1e911 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_accommodation_usage.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days per week did you live in the accommodation?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   days per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   7 is the highest number of days you can enter.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.erb
index 577273e16ab..376363af015 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_additional_work_outside_shift.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you work additional time outside your shift?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Additional time can be either starting early or finishing late outside your shift, for example attending a staff meeting or going through security checks.
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.erb
index 8e2a4d57073..b76377512ea 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/past_paid_for_work_outside_shift.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did your employer pay you for any additional time you worked outside of your shift?
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.erb
index 414b56e52c1..da52e03bd9a 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/was_provided_with_accommodation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did your employer provide you with accommodation?
 <% end %>
 
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.erb
index f88c18e1bc5..77eb75f5d09 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/were_you_an_apprentice.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Were you an apprentice at the time?
 <% end %>
 
@@ -8,6 +8,6 @@
   "apprentice_over_19": "Apprentice aged 19 and over and in your first year"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you were 19 or over and you completed the first year of your apprenticeship, you were not eligible for the apprenticeship National Minimum Wage rate. You should have been paid the National Minimum Wage for your age.
 <% end %>
diff --git a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.erb b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.erb
index 6b4e1fdb14a..23f039729b5 100644
--- a/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.erb
+++ b/lib/smart_answer_flows/am-i-getting-minimum-wage/questions/what_would_you_like_to_check.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What would you like to check?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.erb b/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.erb
index 5d3c53f8b05..9121cebd504 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/benefit_cap_calculator.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Benefit cap calculator
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   You can calculate if you’re affected by the benefit cap
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.erb
index 4f5e1a54976..488efd16743 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you'll be affected by the benefit cap as you get <%= format_money(total_benefits_amount) %> in benefits and your benefit cap is <%= format_money(benefit_cap) %>.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.erb
index 3a1ba9281e4..620ebd5d332 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_london.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re affected by the Greater London benefit cap.
 
 <% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.erb
index 9bb4dc80739..545cf1d1af4 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap_national.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re affected by the outside London benefit cap.
 
 <% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.erb
index e32fdeb370f..22d9f0efb5f 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.erb
index 197d0f8fb5d..cd5408abb95 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_exemptions_future.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.erb
index 4974ebe205d..783ff7122f4 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you won’t be affected by the benefit cap. This is because the total amount of benefits you get are less than the benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.erb
index 3ee7e120c83..5dd2e601072 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_london.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the Greater London benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.erb
index 2123b06480e..d2caaf69f7b 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_less_than_cap_national.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the outside London benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.erb
index 3455b6ceff7..2fee4f40846 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.erb b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.erb
index 3455b6ceff7..2fee4f40846 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_not_affected_no_housing_benefit_future.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not affected by the benefit cap.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.erb
index 305fa2b2450..62146d9ca0f 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/_hints.erb
@@ -1,3 +1,3 @@
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You need the whole weekly amount before anything is taken off (eg utility bills or loan repayments). You must enter the full amount you get for each benefit.
 <% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.erb
index ac1dc2436e2..357c0d0fec2 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/bereavement_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Bereavement Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.erb
index 6ce442eef64..15544b15c2f 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/carers_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Carer's Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.erb
index b4fda57c1b2..67e95e281d4 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_benefit_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Child Benefit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.erb
index 95fd282d9dc..e3608a12019 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/child_tax_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Child Tax Credit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.erb
index 89ca5729613..a018cee9cc7 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/enter_postcode.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter your postcode
 
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   eg SW1A 2AA
 <% end %>
 
-<% render_content_for :error_postcode_invalid do %>
+<% text_for :error_postcode_invalid do %>
   This isn't a valid postcode
 <% end %>
-<% render_content_for :error_postcode_incomplete do %>
+<% text_for :error_postcode_incomplete do %>
   Please enter a full postcode
 <% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.erb
index 4b33c6caaa3..e343db2050e 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/esa_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Employment and Support Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.erb
index 25a3c327342..6f4e8550e5d 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/guardian_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Guardian's Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.erb
index 8161adf66fc..ffabaa260dd 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/housing_benefit_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Housing Benefit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.erb
index 2716447ecff..f079f7b7d0e 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/incapacity_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Incapacity Benefit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.erb
index 9834392f035..03677711c9f 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/income_support_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Income Support?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.erb
index 84867f190b6..3d59c1d7c21 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/jsa_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Jobseeker’s Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.erb
index bc79ed8f32e..acbe707311b 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/maternity_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Maternity Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.erb
index 72971943832..8cd030f08b7 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receive_housing_benefit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you receive Housing Benefit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.erb
index 2e9e1fd77b8..77642a5f253 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_exemption_benefits.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you or someone in your household get any of the following benefits?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you do not receive any of these click 'Next step'.
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.erb
index dec13a9e607..a97fd202438 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/receiving_non_exemption_benefits.erb
@@ -1,9 +1,9 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you or someone in your household get any of the following benefits?
 <% end %>
 
 <% options(benefit_options) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you do not receive any of these click 'Next step'.
 <% end %>
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.erb
index e4a3d58dbf0..e1184e3f583 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/sda_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Severe Disability Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.erb
index 79126e58f21..9fd101c68c7 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/single_couple_lone_parent.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you:
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.erb
index 61a63892bf4..022e250c31f 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widow_pension_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Widow's Pension?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.erb
index 6aafeb88586..5f02936a177 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_mother_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Widowed Mother's Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.erb
index eb5fb08a7e1..094fa9b3df9 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widowed_parent_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Widowed Parent's Allowance?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.erb
index d4bbef8352f..13529574eb4 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/widows_aged_amount.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you or someone in your household get for Widow's Pension (age related)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.erb b/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.erb
index a2b861ba81b..cb246f67a56 100644
--- a/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.erb
+++ b/lib/smart_answer_flows/benefit-cap-calculator/questions/working_tax_credit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you qualify for Working Tax Credit?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You don't need to be getting Working Tax Credit, only qualify for it.
 <% end %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.erb
index 05f21a59aa1..6fa9e547d0f 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/business_coronavirus_support_finder.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Find coronavirus financial support for your business
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Coronavirus (COVID‑19) support is available to employers and the
   self-employed, including sole traders and limited company directors.
   You may be eligible for loans, tax relief and cash grants, whether your
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb
index 812446f1442..e14fa2de63b 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/outcomes/results.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Support you may be entitled to
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.erb
index 13be37287e4..b2fb2c780f4 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/annual_turnover.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your annual turnover?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.erb
index 7bcc60ec6e4..5df8fdb4dc2 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_based.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where is your business based?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.erb
index 5cc2dbc37e0..08f58aaa69a 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/business_size.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many employees does your business have?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.erb
index 26f6dc21cce..86eb44fa3af 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/non_domestic_property.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is the rateable value of your business' non-domestic property?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The rateable value of your property is used by your local council to calculate your business rates bill.
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.erb
index f8e53179173..da97af1e84d 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/paye_scheme.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you an employer with a PAYE scheme?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.erb
index 8e09871b185..ffa6adbc018 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/rate_relief_march_2020.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your business in receipt of small business rate relief or rural rate
   relief as of 11 March 2020?
 <% end %>
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb
index 6631d4c21d3..8ce098c11ee 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/sectors.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your business in any of the following sectors:
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.erb
index d494a11bb27..58e378f60bb 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_assessment_july_2020.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you due to pay a Self Assessment payment on account by 31 July 2020?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.erb
index 20f0652bad1..563e417876e 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/self_employed.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you self-employed?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   For this question, limited company directors are not considered self-employed.
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.erb
index e9e5f79c126..a585b2370dd 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/what_size_was_your_business.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What size was your business as of 28 February?
 <% end %>
 
diff --git a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.erb b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.erb
index 7bcc60ec6e4..5df8fdb4dc2 100644
--- a/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.erb
+++ b/lib/smart_answer_flows/business-coronavirus-support-finder/questions/where_is_your_business_based.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where is your business based?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.erb
index 52645624dbb..5c4cd631e59 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/calculate_agricultural_holiday_entitlement.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your agricultural worker holiday entitlement
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out how much statutory holiday leave you’re entitled to as an agricultural worker
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.erb
index e554f033bc8..1778b4bf9b8 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your statutory holiday entitlement is <%= calculator.holiday_entitlement_days %> days.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.erb
index b0ce8c13bdd..51ccb091d8e 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/outcomes/done_with_number_formatting.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your statutory holiday entitlement is <%= sprintf("%.1f", calculator.holiday_entitlement_days) %> days.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.erb
index 2922efbbcf9..7ef3d260c1c 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_days_per_week.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days do you work per week?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.erb
index bfd7d607b80..578553d06d2 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_total_days.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days will you have worked between 1 October (the start of the leave year) and the start of your holiday?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This includes any days that you worked basic hours, took annual leave or were off sick (whether paid or not).
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a valid number of days (max: <%= calculator.available_days %>)
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.erb
index 20e2c868fcd..7407e86b5e4 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/how_many_weeks_at_current_employer.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many weeks have you worked continuously for your current employer?
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Weeks worked at current employer
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0 and less than 52
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.erb
index 6c8d411901a..1fe63a3a854 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/what_date_does_holiday_start.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What date will your holiday start?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is the first day that you will take off work as leave
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.erb
index b6662a71655..cd34afbfa0d 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/work_the_same_number_of_days_each_week.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you work the same number of days each week?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.erb b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.erb
index 8d376dc7e57..509963ba2b2 100644
--- a/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.erb
+++ b/lib/smart_answer_flows/calculate-agricultural-holiday-entitlement/questions/worked_for_same_employer.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you worked for the same employer for a full year?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.erb
index 6b4655f6b4d..08474988243 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/calculate_employee_redundancy_pay.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your employee's statutory redundancy pay
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Employer calculator - calculate your employee's statutory redundancy payment
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.erb
index 5ae68119740..bc1cc1b033e 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Statutory redundancy payment: <%= format_money(statutory_redundancy_pay) %> (<%= format_money(statutory_redundancy_pay_ni) %> in Northern Ireland).
 
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.erb
index f964c0527a3..528cd41bf84 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/outcomes/done_no_statutory.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your employee is not entitled to statutory redundancy pay.
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.erb
index a6100a9f680..e6182a2fecb 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/age_of_employee.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old was your employee on the date they were made redundant?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   years old
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter an age between 16 and 100.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.erb
index d53722b09ad..8d16627808d 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/date_of_redundancy.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What date was your employee made redundant?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Use the original redundancy date even if their notice is brought forward, they’re paid in lieu of notice or made redundant after trialing a new job.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.erb
index 61572e74bca..f4b7a00f382 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/weekly_pay_before_tax.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is their weekly pay before tax and any other deductions?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Examples of other deductions include student loans and child maintenance.
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.erb b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.erb
index fc818173d94..780d96ec8be 100644
--- a/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.erb
+++ b/lib/smart_answer_flows/calculate-employee-redundancy-pay/questions/years_employed.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Number of years they’ve worked for you
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Only count full years of service. For example, 3 years and 9 months count as 3 years.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number. Based on your previous answers this should be no greater than <%= years_available %>
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.erb
index 27815c62fc7..ef057f9241e 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/calculate_married_couples_allowance.erb
@@ -1,9 +1,9 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your Married Couple's Allowance
 
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out whether you can claim Married Couple's Allowance (MCA) and find out how much you could get taken off your tax bill
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.erb
index 943a3500e74..9125872fc4c 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/highest_earner_done.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The highest earner qualifies for Married Couple's Allowance - they'll get <%= format_money(allowance) %> off their tax bill.
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.erb
index b0cdfb7f531..56fd1f494b7 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/husband_done.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband qualifies for Married Couple's Allowance - he'll get <%= format_money(allowance) %> off his tax bill.
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.erb
index d661a795d72..fd2ef9264e2 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/outcomes/sorry.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You don't qualify for Married Couple's Allowance.
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.erb
index 7c2b34a71cc..82fb6fec4b1 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/did_you_marry_or_civil_partner_before_5_december_2005.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you marry before 5 December 2005?
 <% end %>
 
@@ -7,10 +7,10 @@
   "yes": "Yes"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Before this date the husband's income is used to work out your allowance, after this date it's the income of the highest earner.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please choose 'Yes' or 'No'
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.erb
index 7b6a757e3dc..5e0964b4191 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_before_tax.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay for the whole tax year into a retirement annuity contract (these payments are called ‘gross contributions’)?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   These are payments into pension schemes where your contributions are paid before your income is taxed (called ‘net pay arrangements’) or retirement annuity contracts (called ‘gross contributions’). Enter the total for the whole year. If none, enter 0.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please use numbers only, eg 9000
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.erb
index 8198caba780..4187d51341b 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_contributions_with_tax_relief.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay into a pension this tax year where your pension provider claims tax relief for you?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Only enter what you pay - don’t include the tax relief. If none, please enter 0.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please use numbers only, eg 9000
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.erb
index ef2d9e1613d..30e8c1b7bc8 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/how_much_expected_gift_aided_donations.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to donate to charity through Gift Aid during the entire tax year?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Only enter what you pay - don’t include any tax relief. If none, please enter 0.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please use numbers only, eg 9000
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.erb
index ae26bc89642..98cfd6ef907 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/paying_into_a_pension.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you paying into a pension?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.erb
index d1d0ca56724..0fecc6bae74 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/were_you_or_your_partner_born_on_or_before_6_april_1935.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Were you or your partner born before 6 April 1935?
 <% end %>
 
@@ -7,10 +7,10 @@
   "yes": "Yes"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You must be married or in a civil partnership to qualify.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please choose 'Yes' or 'No'
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.erb
index c0faf28cbbb..d18bdff314d 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_date_of_birth.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's the highest earner's date of birth?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   We need your date of birth to work out your personal allowance (how much of your income is tax-free).
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please choose your date of birth using the drop downs
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.erb
index be26f8d631b..08695c62793 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_highest_earners_income.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's the highest earner's yearly income?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer's Allowance.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please use numbers only, eg 9000
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.erb
index 0e2efdfd4a2..ff5d8d40c25 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_date_of_birth.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's the husband's date of birth?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   We need your date of birth to work out your personal allowance (how much of your income is tax-free).
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please choose your date of birth using the drop downs
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.erb b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.erb
index a375af8239a..450fe197ac6 100644
--- a/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.erb
+++ b/lib/smart_answer_flows/calculate-married-couples-allowance/questions/whats_the_husbands_income.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's the husband's yearly income?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer’s Allowance.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please use numbers only, eg 9000
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.erb
index 56c1af366e2..ae56ba745d2 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/calculate_statutory_sick_pay.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your employee's statutory sick pay
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Statutory Sick Pay (SSP) calculator -  calculate SSP for an employee
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.erb
index 332a85c3fab..200d2e105fe 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/contractual_days_covered_by_earnings.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days does the period represented by these earnings cover?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If it’s 2 weeks and 3 days enter ‘17’.
 <% end %>
 
-<% render_content_for :error_must_be_a_number_of_days do %>
+<% text_for :error_must_be_a_number_of_days do %>
   You need to enter a number of days.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.erb
index 8c6f2280673..41e0ee8d86a 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_gp_letter.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
 Does your employee have an NHS or GP letter telling them to stay at home for at least 12 weeks because of coronavirus (called ‘shielding’)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.erb
index 2d4724b9083..c8eade0ac83 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_related.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your employee off work because of coronavirus (COVID‑19)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.erb
index a5a3a3737d0..62e6a290c7e 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/coronavirus_self_or_cohabitant.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Has your employee or someone they live with got symptoms of coronavirus (COVID‑19)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.erb
index 571658b79e5..e0f3bdfa6df 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/days_covered_by_earnings.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days does the period represented by these earnings cover?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If it’s 2 weeks and 3 days enter ‘17’.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.erb
index 9b3425bcd05..a1746425d84 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_tell_within_limit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did your employee tell you they were sick and unable to come into work within 7 days of their first day of absence (or within your time limit)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.erb
index 0bb46cf1532..aed88e9bf13 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/employee_work_different_days.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does your employee routinely work different days of the week?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.erb
index a5bfb8f9947..f9213704e1d 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/first_sick_day.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   During their most recent period of sickness, when did your employee first become sick?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This includes non-working days and bank holidays.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.erb
index f44a282794a..6639388a061 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/has_linked_sickness.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was your employee off sick within the previous 8 weeks for 4 or more days (including non-working days, weekends and holidays)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.erb
index 13c8a320ac1..62b3d231a8b 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/how_often_pay_employee_pay_patterns.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay the employee?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.erb
index b97b129c6c0..9ca501aeb5e 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/is_your_employee_getting.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your employee getting any of the following?
 <% end %>
 
@@ -11,6 +11,6 @@
   "shared_parental_leave_and_pay": "Shared Parental Leave and Pay"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If none apply just click ‘Next step’
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.erb
index ea0aa68847a..61b5980933c 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_offset.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday on or before <%= format_date(pay_day_offset) %>?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date on or before <%= format_date(pay_day_offset) %>
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.erb
index c11cfe433d0..cbd10374026 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_payday_before_sickness.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday before <%= format_date(sick_start_date_for_awe) %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you pay someone earlier or later than their normal payday, for example after a bank holiday or due to a factory closure, use the date you'd normally pay them, not the actual payday.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date before <%= format_date(sick_start_date_for_awe) %>
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.erb
index 363cb50a0eb..580997eb734 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/last_sick_day.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the last day of sickness
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This can include non-working days and bank holidays
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   End date should be on or after start date
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.erb
index a1b5db5a0a6..9572f6eb7be 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_end_date.erb
@@ -1,13 +1,13 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the end date for this linked period of sickness.
 <% end %>
 
-<% render_content_for :error_must_be_valid_period_of_incapacity_for_work do %>
+<% text_for :error_must_be_valid_period_of_incapacity_for_work do %>
   The linked period of sickness must be at least 4 calendar days long.
 <% end %>
-<% render_content_for :error_must_be_within_eight_weeks do %>
+<% text_for :error_must_be_within_eight_weeks do %>
   You need to enter a date within 8 weeks of the current period of sickness or it isn't a linked period of sickness.
 <% end %>
-<% render_content_for :error_must_be_at_least_1_day_before_first_sick_day do %>
+<% text_for :error_must_be_at_least_1_day_before_first_sick_day do %>
   You need to enter a date at least 1 day before the start of the current period of sickness or it isn't a separate linked period of sickness.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.erb
index 629893e5309..e4fc81726d5 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/linked_sickness_start_date.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the start date for this linked period of sickness.
 <% end %>
 
-<% render_content_for :error_linked_sickness_must_be_before do %>
+<% text_for :error_linked_sickness_must_be_before do %>
   A linked sickness period must start and end before the most recent or current period of sickness
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.erb
index ed1e4b27d15..9c26f4c9aa7 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/paid_at_least_8_weeks.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   On <%= format_date(sick_start_date_for_awe) %> had you paid your employee at least 8 weeks of earnings?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.erb
index c47fcc0cc62..4ce44f89682 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/pay_amount_if_not_sick.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter how much you would have paid the employee on their first payday if they hadn’t been sick.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.erb
index 99d2f3b81a2..967422a8e30 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_earnings_before_sick_period.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the total earnings paid before <%= format_date(sick_start_date_for_awe) %>.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.erb
index e503d244174..f0abb6d49ab 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/total_employee_earnings.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the total amount (before deductions like Income Tax and National Insurance) of your employee’s earnings on paydays between <%= format_date(relevant_period_from) %> and <%= format_date(relevant_period_to) %>.
 <% end %>
 
@@ -7,6 +7,6 @@
 
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.erb b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.erb
index 9b54675e05e..80a2ca5d412 100644
--- a/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.erb
+++ b/lib/smart_answer_flows/calculate-statutory-sick-pay/questions/usual_work_days.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which days of the week do they usually work?
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.erb
index e107dded96d..139d598b94d 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/calculate_your_holiday_entitlement.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate holiday entitlement
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Holiday calculator to work out statutory holiday leave in days or hours
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.erb
index a729daf9ab2..1501e849982 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/basis_of_calculation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the holiday entitlement based on:
 <% end %>
 
@@ -11,6 +11,6 @@
   "shift-worker": "shifts"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Check the employment contract if you’re not sure about the holiday entitlement.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.erb
index e5736d64bf0..efb249c3d14 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/calculation_period.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you want to work out holiday:
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.erb
index 622d945fcb2..502a0e5941c 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_days_per_week.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Number of days per week worked?
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Days per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please check and enter a correct value. Do not enter fractions. If you work half-days, enter .5 for half. For example, 4.5
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.erb
index f807ee992a4..b086cd42882 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/compressed_hours_how_many_hours_per_week.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours are worked per week?
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Hours per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You can enter a maximum of 168 hours per week. Do not enter fractions. If you work half-hours, enter .5 for half. For example, 40.5
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.erb
index 67b000f05d9..100386757e0 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Number of days worked per week?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you work half-days enter .5 for a half, for example 3.5 for three and a half days.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   There are only 7 days in a week. Please check and enter a correct value.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.erb
index c563ecca72e..a4f3830ff60 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_days_per_week_for_hours.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Number of days worked per week?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   We need this to calculate how many hours are worked in an average day. Include half-days, for example 3.5.
 <% end %>
 
-<% render_content_for :error_over_7_days_per_week do %>
+<% text_for :error_over_7_days_per_week do %>
   There are only 7 days in a week. Please check and enter a correct value.
 <% end %>
 
-<% render_content_for :error_over_24_hours_per_day do %>
+<% text_for :error_over_24_hours_per_day do %>
   There are only 24 hours per day. Please check and enter a correct value.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.erb
index 7cb6dd3ad5c..bf56bb28e5a 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/how_many_hours_per_week.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Number of hours worked per week?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Include half-hours, for example 40.5.
 <% end %>
 
-<% render_content_for :error_over_168_hours_worked do %>
+<% text_for :error_over_168_hours_worked do %>
   You can enter a maximum of 168 hours per week. Do not enter fractions. If you work half-hours, enter .5 for half. For example, 40.5
 <% end %>
 
-<% render_content_for :error_no_hours_worked do %>
+<% text_for :error_no_hours_worked do %>
   Please enter at least .5 hours worked. Do not enter fractions. If you work half-hours, enter .5 for half. For example, 40.5
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.erb
index f99857cd15b..65305791aff 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_basis.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you want to calculate the holiday:
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.erb
index 04bb731896f..f1ec4a31bbe 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_days_per_shift_pattern.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days in the shift pattern?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The shift pattern includes non-working days.
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Days per pattern
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a number greater than or equal to the number of shifts you work. Do not enter fractions. If you work half-days, enter .5 for half. For example, 4.5
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.erb
index 7567499b855..6683b66285d 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_hours_per_shift.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours in each shift?
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Hours per shift
 <% end %>
 
-<% render_content_for :error_no_hours_worked do %>
+<% text_for :error_no_hours_worked do %>
   You need to enter a number greater than 0. Do not enter fractions. If you work half-hours, enter .5 for half. For example 4.5
 <% end %>
 
-<% render_content_for :error_over_24_hours_worked do %>
+<% text_for :error_over_24_hours_worked do %>
   24 is the maximum number of hours per shift. Do not enter fractions. If you work half-hours, enter .5 for half. For example 4.5
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.erb
index 22e393a4dc3..8b9256e7704 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/shift_worker_shifts_per_shift_pattern.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many shifts will be worked per shift pattern?
 <% end %>
 
-<% render_content_for :label do %>
+<% text_for :label do %>
   Shifts per pattern
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.erb
index 9beaaddd6ff..dd2c4139916 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_leaving_date.erb
@@ -1,13 +1,13 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the employment end date?
 <% end %>
 
 <% if start_date %>
-  <% render_content_for :error_end_date_before_start_date do %>
+  <% text_for :error_end_date_before_start_date do %>
     Your end date can not be before your start date of <%="#{start_date.strftime('%d %B %Y')}"%>.
   <% end %>
 
-  <% render_content_for :error_end_date_outside_year_range do %>
+  <% text_for :error_end_date_outside_year_range do %>
       Your employment end date must be within 1 year of your start date of <%="#{start_date.strftime('%d %B %Y')}"%>.
   <% end %>
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.erb
index adea58b7c73..5984eccb261 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/what_is_your_starting_date.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the employment start date?
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.erb b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.erb
index 84ce62cb141..c3191e0dd3a 100644
--- a/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.erb
+++ b/lib/smart_answer_flows/calculate-your-holiday-entitlement/questions/when_does_your_leave_year_start.erb
@@ -1,27 +1,27 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does the leave year start?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is usually in the employment contract. If it is not and the job was started after 1 October 1998, the leave year will start on the 1st day of the job. If the job was started on or before 1 October 1998, the leave year will start on 1 October.
 <% end %>
 
 <% if leaving_date%>
-  <% render_content_for :error_end_date_before_start_date do %>
+  <% text_for :error_end_date_before_start_date do %>
     Your leave year start date must be earlier than your employment end date of <%="#{leaving_date.strftime('%d %B %Y')}"%>.
   <% end %>
 
-  <% render_content_for :error_end_date_outside_leave_year_range do %>
+  <% text_for :error_end_date_outside_leave_year_range do %>
     Your employment end date of <%="#{leaving_date.strftime('%d %B %Y')}"%> must be within 1 year of the leave year start date.
   <% end %>
 <% end %>
 
 <% if start_date%>
-  <% render_content_for :error_start_date_before_start_leave_year_date do %>
+  <% text_for :error_start_date_before_start_leave_year_date do %>
     Your leave year start date must be earlier than your employment start date of <%="#{start_date.strftime('%d %B %Y')}"%>.
   <% end%>
 
-  <% render_content_for :error_start_date_outside_leave_year_range do %>
+  <% text_for :error_start_date_outside_leave_year_range do %>
     Your employment start date of <%="#{start_date.strftime('%d %B %Y')}"%> must be within 1 year of the leave year start date.
   <% end %>
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.erb
index 1473851924c..8ae470a08d6 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/calculate_your_redundancy_pay.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your statutory redundancy pay
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Calculate how much statutory redundancy you can get based on age, weekly pay and number of years in the job
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.erb
index 205caeecc11..fd747f32693 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, your statutory redundancy payment is <%= format_money(statutory_redundancy_pay) %> (<%= format_money(statutory_redundancy_pay_ni) %> in Northern Ireland).
 
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.erb
index eeb6950aa89..758bfc2f357 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/outcomes/done_no_statutory.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Based on your answers, you’re not entitled to statutory redundancy pay.
 <% end %>
 
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.erb
index 7f3b34d6e4d..ca7d2a3db71 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/age_of_employee.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old were you on the date you were made redundant?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter an age between 16 and 100.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.erb
index 558b360a910..7d7f0263818 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/date_of_redundancy.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What date were you made redundant?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Use the original redundancy date even if your notice is brought forward, you’re paid in lieu of notice or made redundant after trialing a new job.
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.erb
index e67caac409f..90ff8233875 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/weekly_pay_before_tax.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your weekly pay before tax and any other deductions?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Examples of other deductions include student loans and child maintenance.
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   per week
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.erb b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.erb
index fd6e7c70435..159641cb92b 100644
--- a/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.erb
+++ b/lib/smart_answer_flows/calculate-your-redundancy-pay/questions/years_employed.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many years have you worked for your employer?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Only count full years of service. For example, 3 years and 9 months count as 3 years.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number. Based on your previous answers this should be no greater than <%= years_available %>
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/check_uk_visa.erb b/lib/smart_answer_flows/check-uk-visa/check_uk_visa.erb
index b7d6e8fc047..10ca6cfaa0c 100644
--- a/lib/smart_answer_flows/check-uk-visa/check_uk_visa.erb
+++ b/lib/smart_answer_flows/check-uk-visa/check_uk_visa.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check if you need a UK visa
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   You may need a visa to come to the UK to visit, study or work.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.erb
index b1400ea13e7..2232aee3ff5 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_diplomatic_business.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Diplomatic Business
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.erb
index a5f64b2605f..4d49fdc1498 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_m.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You may need a visa to join a member of your family or partner for a long stay
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.erb
index 85ca20cb441..9ea6d9e468b 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_joining_family_nvn.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to join your family or partner in the UK for a long stay
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.erb
index 1b6cc581b12..2957751511d 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_electronic_visa_waiver.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.erb
index 3a67debf983..42a65ebc164 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_nvn_ukot.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.erb
index 3d90263fbed..b903935b805 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_taiwan.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.erb
index 0a7cd96e9eb..3ae7e249938 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_marriage_visa_nat_datv.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.erb
index fe7da26be99..7598e9e18d0 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_n.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won’t need a visa to visit the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.erb
index c98ca35593a..bc54098778e 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_medical_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to visit the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.erb
index 86f4be58d61..66de06ac8a1 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_no_visa_needed.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You do not need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.erb
index 0378f6e6ba1..94a0f0687de 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_british_citizen_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to join your family or partner in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.erb
index 34de0e94482..18f8e038cf0 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_n.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to join your family or partner in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.erb
index 5030ccd6141..d8dd83a1bfa 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_partner_family_eea_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to join your family or partner in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.erb
index e4678b783cc..4749a002d9c 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_n.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won’t need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.erb
index 6a1dea27780..a2bdc07ad0c 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_waiver.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need an electronic visa waiver (EVW) or a visa
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.erb
index 4fc24d099f8..f9b7ae0cdd8 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_school_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to stay with your child
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.erb
index 420d83a347f..5571f6102bc 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_standard_visitor_visa.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.erb
index 87b56ecf81e..ed234b6cd01 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_m.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to study in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.erb
index 781263d7351..f8e5fbec27d 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need an electronic visa waiver (EVW) or a visa
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.erb
index 1c45202ef22..583d8118712 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_waiver_taiwan.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won't need a visa if your passport has a personal ID number on the bio data page.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.erb
index 690b6b4b5d4..f844fc81333 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_study_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to study in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.erb
index fbf54cf2c0e..bde35cf46a0 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_tourism_visa_partner.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to come to the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.erb
index 61b4fabb860..b46236a3318 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_datv_exception.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won’t need a visa to pass through the UK in transit
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.erb
index 6c91d93e9ca..b4591cc73ba 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.passport_country_in_electronic_visa_waiver_list? %>
     You’ll need an electronic visa waiver (EVW) or a Visitor in Transit visa
   <% else %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.erb
index c52eda384a1..633870a8fb9 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_leaving_airport_datv.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to pass through the UK in transit
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.erb
index 50134aa8d29..c91a6166113 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_not_leaving_airport.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to pass through the UK in transit (unless you’re exempt)
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.erb
index ef8afdb6e7d..65cc7f38406 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_refugee_not_leaving_airport.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You may need a Direct Airside Transit Visa
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.erb
index 197642ce13e..b9450cf69a7 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won’t need a visa if your passport has a personal ID number on the bio data page.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.erb
index a3a7977d384..08aec6ffec4 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_taiwan_through_border_control.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won't need a visa if your passport has a personal ID number on the bio data page.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.erb
index b5d26db8d72..c95da8f25e8 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_to_the_republic_of_ireland.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.passport_country_is_taiwan? %>
     You won’t need a visa if your passport has a personal ID number on the bio data page.
   <% elsif calculator.passport_country_in_electronic_visa_waiver_list? %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.erb
index 7b8963641d2..c446a430f75 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_transit_venezuela.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won’t need a visa if you have an ePassport
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.erb
index 90c2dcb7d1b..13cf1b4a49f 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need an electronic visa waiver (EVW) or a visitor visa
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.erb
index b2f8d3292a9..c575882a880 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_visit_waiver_taiwan.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You won't need a visa if your passport has a personal ID number on the bio data page.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.erb
index da66773be5d..8364e1b7541 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_m.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You'll need a visa to work, do business or academic research in the UK
 
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.erb
index e5191ce36ab..35faf763223 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_n.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You don't need a visa for some business and academic visits, but you must get a visa to work in the UK.
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.erb
index 39c1e11f324..2202d0114ea 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_waiver.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You'll need to apply to do business, academic research or work in the UK
 
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.erb b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.erb
index 8e6c6248fc5..91ca9828a85 100644
--- a/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.erb
+++ b/lib/smart_answer_flows/check-uk-visa/outcomes/outcome_work_y.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll need a visa to work or do business or academic research in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.erb b/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.erb
index 6b5c0fe7d37..a2869b74e18 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/article_10_card.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have an Article 10 or 20 card?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.erb b/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.erb
index 0b651d94764..56c2c950ef2 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/channel_islands_or_isle_of_man.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What are you coming to the Channel Islands or Isle of Man to do?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.erb b/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.erb
index 0eb4d8afe63..b0b646a55d4 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/israeli_document_type.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What sort of passport do you have?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.erb b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.erb
index e27f96ad4d0..1ffb5ae9a29 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_british_citizen.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your partner or family member a British citizen, or settled in the UK?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.erb b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.erb
index 2676f896f4e..a1626a7d522 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/partner_family_eea.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your partner or family member from the European Economic Area (EEA)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.erb b/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.erb
index fd39683dd30..2865deb7b4b 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/passing_through_uk_border_control.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Will you pass through UK border control?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.erb b/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.erb
index 19d4bf25165..310573a52c6 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/purpose_of_visit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What are you coming to the UK to do?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.erb b/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.erb
index 9b24d0c3bcd..a8f3567f9ab 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/staying_for_how_long.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How long are you planning to <%= study_or_work %> in the UK for?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.erb b/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.erb
index 08b8ebcf7cb..5744934fcad 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/travelling_to_cta.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where are you travelling to?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.erb b/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.erb
index 1393dde8e9a..bc0594f5205 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/travelling_visiting_partner_family_member.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Will you be travelling with or visiting either your partner or a family member in
   the UK?
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.erb
index 2e9e13575a2..38e749faf06 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_passport_do_you_have.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What’s your nationality as shown on your passport or travel document?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you’re a refugee or don’t have a passport or travel document, select ‘Stateless or refugee’.
 <% end %>
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.erb
index 02733d5d491..18c249d3039 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_passport.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What sort of passport do you have?
 <% end %>
 
diff --git a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.erb b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.erb
index 0a0d88da606..7436f43c542 100644
--- a/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.erb
+++ b/lib/smart_answer_flows/check-uk-visa/questions/what_sort_of_travel_document.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What sort of travel document do you have?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.erb
index afef543fd42..c3bd020af3b 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/childcare_costs_for_tax_credits.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Tax credits: work out your childcare costs
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out your eligible weekly childcare costs, when to report a change in costs
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.erb
index 1478f11ccfb..c32b4f1a2df 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_detailed.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Call the Tax Credit Helpline to work out your average weekly childcare costs.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.erb
index 31999bd848e..372ceb4309d 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/call_helpline_plain.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Contact the Tax Credit Office for help in working out your costs.
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.erb
index f278441ce65..79380d9c9cf 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/cost_changed.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your average weekly childcare costs have <%= title_change_text %> by <%= format_money(difference_money) %>.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.erb
index 7c282c831c9..c3204bed0a6 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_change.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   There is no change to your tax credits.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.erb
index 9d7f85ba91e..f2337f07f74 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/no_longer_paying.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’re no longer paying for childcare.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.erb
index ce32150ad93..b0e917ab661 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/round_up_weekly.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Round up the amount you pay each week to the nearest pound to get your weekly childcare cost.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.erb
index a119520926c..ff8e3b85057 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/outcomes/weekly_costs_are_x.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your weekly childcare costs are <%= format_money(weekly_cost) %>.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.erb
index 132a9a826b8..ff15f2f3b3f 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/currently_claiming.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you currently claiming tax credits for childcare costs?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.erb
index 8efa931b344..1598604fb93 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/have_costs_changed.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have the costs of your childcare changed since you last made your claim?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.erb
index c18c3eade78..b48797a5085 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_1.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay in total for childcare for the next 12 months?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Add up the amounts you expect to pay in total for the next 12 months - start from the day you’re doing the calculation
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.erb
index a5acd8a7a15..41127235065 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_12_months_2.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay in total for childcare for the next 12 months?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.erb
index a3b4130e0e2..6fa48c985f9 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_4_weeks.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you pay every 4 weeks?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.erb
index 0f00cab9a5c..5dfc2c6176c 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_1.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay in total for childcare for the next 52 weeks?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Add up the amounts you expect to pay in total for the next 52 weeks - start from the day you’re doing the calculation
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.erb
index ed51743690c..b4bede51210 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_52_weeks_2.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to pay in total for childcare for the next 52 weeks?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.erb
index 789011bcb03..f00d7be3071 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_each_month.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you pay each month?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.erb
index f2866436f68..212df882f8a 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_fortnightly.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you pay each fortnight?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.erb
index ccbb646715c..2b20be596df 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_spent_last_12_months.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much have you spent on childcare in the last 12 months?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Add up how much you have spent in total over the last 12 months - start backwards from the date you’re doing the calculation.
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.erb
index cfb0ffd362f..18fd7a7a759 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_much_yearly.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you pay every year?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.erb
index f15cc392706..c19b6aebdf4 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_1.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay your childcare provider(s)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.erb
index f15cc392706..c19b6aebdf4 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_2.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay your childcare provider(s)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.erb
index 9c3c459b338..5fb516e1572 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_pay_providers.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay your childcare provider(s)?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.erb
index 08cc7d8fa55..250c388a1bf 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/how_often_use_childcare.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you use childcare?
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.erb
index 2170e35138b..d5ab083abb5 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_monthly_cost.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's the new monthly cost of your childcare?
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.erb
index 5bb93b2d6f5..cbc3b440984 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/new_weekly_costs.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What are your new weekly costs?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Round the total up to the nearest pound.
 <% end %>
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.erb
index b9ab6a53461..da51aea78aa 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_monthly_amount.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the old monthly amount you gave the Tax Credit Office?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Round the total up to the nearest pound.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.erb
index 8e8c9fec2ac..063da808b41 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_1.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the old average weekly amount you gave the Tax Credit Office?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Round the total up to the nearest pound.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.erb
index 8e8c9fec2ac..063da808b41 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/old_weekly_amount_2.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the old average weekly amount you gave the Tax Credit Office?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Round the total up to the nearest pound.
 <% end %>
 
diff --git a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.erb b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.erb
index 3658bbb56e3..e9c4ad6619b 100644
--- a/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.erb
+++ b/lib/smart_answer_flows/childcare-costs-for-tax-credits/questions/pay_same_each_time.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you pay the same each time?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Answer no if you pay a different amount each week or month, or during school holidays. This is known as 'variable costs'.
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.erb
index cbab5464179..05eccc1ef7e 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/coronavirus_employee_risk_assessment.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check if you should go back into work
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.erb
index e29e237054f..9399f867b71 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/go_back_to_work.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You can go back to work
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.erb
index 8198c598537..7ac067bab8f 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/outcomes/you_should_not_be_going_to_work.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You should not be going to work
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.erb
index e8752e7ef87..f9b820a2405 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_shielding.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you shielding at home because you are clinically extremely vulnerable?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.erb
index 25bd27a56ab..d778c9cc311 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/are_you_vulnerable.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you clinically vulnerable?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.erb
index fe0746f507e..26d68b244d2 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/can_work_from_home.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you able to do your job from home?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.erb
index 6fd218be11f..248cbd94a96 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/do_you_live_with_someone_vulnerable.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you live with someone who is clinically extremely vulnerable?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.erb
index e65374fc308..3b19a6014b4 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/have_childcare_responsibility.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have responsibilities for childcare or other dependents that make it difficult for you to go to work?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.erb
index 727382a9bc5..65e48fecaac 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_employer_asking_you_to_work.erb
@@ -4,7 +4,7 @@
   If there is still work to do despite your workplace being closed, your employer might ask you to work from home or come into work.
 <% end %>
 
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your employer asking you to work or to start work from 4 July 2020?
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.erb
index 1adb547235d..d7481ab5f27 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_auction_house.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your workplace a livestock auction house? 
 <% end %>
 
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.erb
index b25514523fb..e350902a972 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/is_your_workplace_an_exception.erb
@@ -13,7 +13,7 @@
     }
   end
 %>
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% case workplace %>
   <% when "museums_or_galleries" %>
     Is your place of work a retail gallery?
diff --git a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.erb b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.erb
index 612cc4e3aa6..0b9e0bf95ed 100644
--- a/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.erb
+++ b/lib/smart_answer_flows/coronavirus-employee-risk-assessment/questions/where_do_you_work.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where do you work?
 <% end %>
 
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.erb
index 11024d1e1e0..48543333f34 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/estimate_self_assessment_penalties.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Estimate your penalty for late Self Assessment tax returns and payments
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   If you’ve missed Self Assessment deadlines get an estimate of how much you’ll need to pay in penalties and interest
 <% end %>
 
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.erb
index f4450914e1d..cc78a17582f 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/filed_and_paid_on_time.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You don't have to pay a penalty
 <% end %>
 
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.erb
index 9ecc046180d..0b910332051 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/outcomes/late.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You paid tax or sent your return late
 <% end %>
 
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.erb
index 690200baf14..8e76de63fbf 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_much_tax.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much was your tax bill?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Enter an estimate if you don't know the exact amount.
 <% end %>
 
@@ -10,6 +10,6 @@
   Your details won't be passed to HMRC.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.erb
index 219f3ce1381..3f2a4da19be 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/how_submitted.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How did you send your Self Assessment tax return?
 <% end %>
 
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.erb
index fbe4ea37365..41e002ffed5 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_paid.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you pay the bill?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you haven’t paid yet, enter the date you expect HM Revenue &amp; Customs to get your payment
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a date on or after <%= format_date(calculator.filing_date) %>
 <% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.erb
index 898a9e7c663..2cb5bfb3240 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/when_submitted.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you send your Self Assessment tax return?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you sent it online, enter the date you submitted the return. If you sent it on paper, add 2 days to the date you posted it. If you haven’t sent it yet, enter the date you expect to send it.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a date on or after <%= format_date(calculator.start_of_next_tax_year) %>
 <% end %>
diff --git a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.erb b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.erb
index c4808a58d0a..159cf1dda7a 100644
--- a/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.erb
+++ b/lib/smart_answer_flows/estimate-self-assessment-penalties/questions/which_year.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   For which tax year do you want the estimate?
 <% end %>
 
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.erb
index c76634d1102..5f1ef46cf07 100644
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.erb
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/help_if_you_are_arrested_abroad.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Help if you're arrested abroad
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Find out what the Foreign and Commonwealth Office can do to help if you or someone you know is arrested abroad.
 <% end %>
 
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.erb
index b4bd65d1b5c..457b41104ab 100644
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.erb
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_one_generic.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Help for British nationals arrested abroad
 <% end %>
 
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.erb
index 681f1140baf..6cc479e21d0 100644
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.erb
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/outcomes/answer_three_british_overseas_territories.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Help for British nationals arrested abroad
 <% end %>
 
diff --git a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.erb b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.erb
index f3979de914b..18119a109e9 100644
--- a/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.erb
+++ b/lib/smart_answer_flows/help-if-you-are-arrested-abroad/questions/which_country.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which country?
 <% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.erb
index b35688917c4..d29c055e3ed 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/inherits_someone_dies_without_will.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Intestacy - who inherits if someone dies without a will?
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Find out who is entitled to a share of someone’s property, possessions and money if they die without making a will
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.erb
index f58564eabf5..550e5d3807b 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_1.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets all of the estate.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.erb
index b8d1b82acb3..206743c8e1d 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_2.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the children or their descendants.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.erb
index b5ccc33ecb0..c0e13b8a687 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_20.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner keeps all the assets (including property), up to £270,000, and all the personal possessions, whatever their value.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.erb
index 592abd7b89d..f0f1e62e83a 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_23.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the half-brothers or half-sisters.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.erb
index f792d64b748..e8c84df7145 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_24.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the half-aunts or half-uncles.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.erb
index 7bea2977582..47494e28b16 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_25.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The whole estate goes to the Crown.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.erb
index 77a48966efb..ce8405b2339 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_3.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the parents.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.erb
index c6e7bb93ed5..ae8bfe86b52 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_4.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the brothers or sisters.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.erb
index 2b71e885f56..ba4aea7db00 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_40.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets the house up to a value of £473,000. They’ll get a lump sum of £473,000 if the house is worth more, and may have to sell off the property.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.erb
index 8cce53f5316..5417aeec574 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_41.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets the house up to a value of £473,000. They’ll get a lump sum of £473,000 if the house is worth more, and may have to sell off the property.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.erb
index 245dfeae580..426086a871c 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_42.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets the house up to a value of £473,000.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.erb
index 7fa5c079eb5..5b8fdf5fd99 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_43.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets the house up to a value of £473,000. They’ll get a lump sum of £473,000 if the house is worth more, and may have to sell off the property.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.erb
index 6d817f2a047..f5944d41abb 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_44.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is split in two, half goes to the parents and half to the brothers or sisters.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.erb
index 27d95ffc4db..4cc1bd3f2f2 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_45.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between any great aunts or great uncles.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.erb
index 94e058946ef..e59d6daa055 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_46.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The whole estate goes to the Crown.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.erb
index 83887a331d8..8c9c2011edc 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_5.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the grandparent(s).
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.erb
index 74e4c30b014..d9d3b8afa7a 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_6.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the aunts or uncles.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.erb
index 12f91d9b9c5..094dc71b99b 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_60.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets all of the estate but they must survive the deceased by at least 28 days.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.erb
index 74be4d28f7e..cfe33494211 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_61.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner keeps all the assets (including property), up to £250,000, and all the personal possessions, whatever their value.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.erb
index a22325e67db..175d631e313 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_62.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner keeps all the assets (including property), up to £250,000, and all the personal possessions, whatever their value.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.erb
index 3e8c1ef97da..84f32835fd4 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_63.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner keeps all the assets (including property) up to £450,000, and all the personal possessions, whatever their value.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.erb
index 5c7c8a1408d..346526cf98e 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_64.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner keeps all the assets (including property) up to £450,000, and all the personal possessions, whatever their value.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.erb
index 12f91d9b9c5..094dc71b99b 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_65.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The husband, wife or civil partner gets all of the estate but they must survive the deceased by at least 28 days.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.erb
index d4224fcfae9..8f9e0629be8 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_66.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate is shared equally between the children.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.erb
index c31b4ff6247..f4e39b65bd4 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/outcomes/outcome_67.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   The estate goes to the next of kin - the person is closest in blood relationship to the deceased in the family tree.
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.erb
index ef9d96a7a65..b41ba834c85 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/aunts_or_uncles.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the deceased have any aunts or uncles?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.erb
index cd74e29acac..8e2ecdf89e6 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/children.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are there any living children, grandchildren or other direct descendants (eg great-grandchildren)?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Children include legally-adopted sons or daughters (but not stepchildren).
 <% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.erb
index ee826de60ac..a0c66282223 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_250000.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the estate likely to be worth more than £250,000?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.erb
index 9e7878ac8cb..05a4b37af94 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/estate_over_270000.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the estate likely to be worth more than £270,000?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.erb
index 1d0fe945e66..4c8df513adc 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/grandparents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are there any living grandparents?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.erb
index fa5b25227df..8785b79107f 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/great_aunts_or_uncles.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are there any living great aunts or great uncles?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Great aunts and great uncles are brothers or sisters of the grandparents of the deceased.
 <% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.erb
index d34ff5df081..1c8a33a09fd 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_aunts_or_uncles.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the deceased have any half-aunts or half-uncles?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.erb
index 56fad346a5c..4d828e59c3b 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/half_siblings.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the deceased have any half-brothers or half-sisters?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.erb
index e0eb83cdf50..1ea2f72c01d 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/more_than_one_child.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did they have more than one child?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.erb
index 86945659d1a..d37c3b736d3 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/parents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are there any living parents?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.erb
index 85052599d25..4f039c7d158 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/partner.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is there a living husband, wife or civil partner?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   A surviving partner who wasn't married or in a civil partnership with the deceased has no automatic right to inherit.
 <% end %>
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.erb
index b6a548b33e9..29248c8f789 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/region.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where did the deceased live?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.erb
index cccbf9e2d07..14edb5ecc75 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the deceased have any brothers or sisters?
 <% end %>
 
diff --git a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.erb b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.erb
index cccbf9e2d07..14edb5ecc75 100644
--- a/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.erb
+++ b/lib/smart_answer_flows/inherits-someone-dies-without-will/questions/siblings_including_mixed_parents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the deceased have any brothers or sisters?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.erb b/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.erb
index d6ba5f4a6d1..75943909bd3 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/landlord_immigration_check.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check if someone can rent your residential property
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   You need to check if a tenant is allowed to rent private residential property in England
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.erb
index 6f6196074e1..1afc6616d86 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/family_permit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have a UK residence card (current or expired) marked ‘permanent residence’?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.erb
index b41927856ab..336b77c4aab 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_documents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have a Home Office document marked ‘exempt from immigration control’, ‘no time limit’ or ‘right of abode’?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.erb
index 08e99d01298..b030804255d 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_eu_documents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Has the person proved they’re an EU, EEA or Swiss national by showing you their current or expired:
 <% end %>
 
@@ -12,6 +12,6 @@
   - UK registration certificate marked 'Residence documentation'
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The registration certificate can be in their passport, or on a pink or blue document from the Home Office.
 <% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.erb
index 1bb7c5b8a08..0f16633a604 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_other_documents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have 2 of the following:
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.erb
index a5a08e94cf4..ec0c3927c36 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_residence_card_or_eu_eea_swiss_family_member.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have a current UK residence card marked with any of the following.
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.erb
index 9bafeec0a03..d0ea0511ca5 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/has_uk_passport.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have any of the following:
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.erb
index be6bfd5c0c1..7d34fd8a0e3 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/immigration_application.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the Home Office tell the person they have special permission to rent?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.erb
index 3018c3151c0..89cc70adc51 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/main_home.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the person renting the property as their main home?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/property.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/property.erb
index 3686b469e0b..eb9dd68206c 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/property.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/property.erb
@@ -1,13 +1,13 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Enter the postcode of the property you want to let:
 <% end %>
 
-<% render_content_for :error_postcode_invalid do %>
+<% text_for :error_postcode_invalid do %>
   Invalid postcode
 <% end %>
-<% render_content_for :error_postcode_incomplete do %>
+<% text_for :error_postcode_incomplete do %>
   Please enter a full postcode
 <% end %>
-<% render_content_for :error_postcode_lookup_failed do %>
+<% text_for :error_postcode_lookup_failed do %>
   Fetching information for this postcode failed, please try again later
 <% end %>
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.erb
index 187e8ff9307..bfe54317481 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/property_type.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What kind of property are you letting?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.erb
index f0c789cc6bf..782ef304a82 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/tenant_over_18.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the person at least 18 years of age?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.erb
index bc5a662939f..68e414e2d6e 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/time_limited_to_remain.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the person have a Home Office document showing they have ‘leave to enter’ or ‘leave to remain’ in the UK until a future date?
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.erb
index 1cad9eafe64..9cb0c6fd72f 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/waiting_for_documents.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   If the person doesn’t have the right documents, are they waiting for:
 <% end %>
 
diff --git a/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.erb b/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.erb
index 19f242397d5..db84f4d96ef 100644
--- a/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.erb
+++ b/lib/smart_answer_flows/landlord-immigration-check/questions/what_nationality.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the person:
 <% end %>
 
diff --git a/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb b/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb
index c8635d3fbbf..8fcc94ef1a1 100644
--- a/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb
+++ b/lib/smart_answer_flows/marriage-abroad/marriage_abroad.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Getting married abroad
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Requirements, paperwork and processes for weddings and civil partnerships overseas - registration, restrictions, fees
 <% end %>
 
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.erb
index e363d5ea076..a9c4d45b07c 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/china/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in China
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.erb
index 0b3dc687bde..5415547ab24 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/colombia/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
     <% if calculator.partner_is_same_sex? %>
       Same-sex marriage in Colombia
     <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.erb
index ffdd2a59172..3be0cd6f37d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/croatia/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Civil partnership in Croatia
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.erb
index 8e976d9bb12..66ef897e8e1 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/finland/_title.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Marriage in Finland
 <% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.erb
index e3418aad277..568846860b8 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/france/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Marriage and PACS in France
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.erb
index 57f2b0392f1..45771a9680b 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/germany/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     <% if calculator.partner_is_national_of_ceremony_country? %>
       Same-sex marriage in Germany
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.erb
index 5a0516fea59..a0eeb088d55 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iceland/_title.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Marriage and Civil partnership in Iceland
 <% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.erb
index 33206873926..b4a6896132e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/iran/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage and civil partnership in Iran
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.erb
index 76eb7b348eb..0310c4400e3 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/jordan/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage and civil partnership in Jordan
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.erb
index c09fd970940..c552cd5bbe0 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/latvia/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     <% if calculator.partner_is_national_of_ceremony_country? %>
       Same-sex marriage and civil partnership in Latvia
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.erb
index 2e20f50ea6b..83b3850dc5d 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/mozambique/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage and civil partnership in Mozambique
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.erb
index 746f36c7c9f..17e1e6809f2 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/philippines/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in the Philippines
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.erb
index 845c726df13..7abc5067ad3 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/poland/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage and civil partnership in Poland
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.erb
index b5d2b015947..574477d4833 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/portugal/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in Portugal
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.erb
index e828b21046e..7d5090460a7 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/romania/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? &&
       calculator.partner_is_national_of_ceremony_country? %>
     Same-sex marriage and civil partnership in Romania
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.erb
index 05ad2e6752f..8b1d0c119e4 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/thailand/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage and civil partnership in Thailand
     <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.erb
index dcb6579b085..352db739f29 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/turkey/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in Turkey
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.erb
index d5fc3e542f8..d20329e9d3e 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/usa/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in the USA
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.erb
index ec91ac2025e..dd2f954fe01 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/countries/vietnam/_title.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if calculator.partner_is_same_sex? %>
     Same-sex marriage in Vietnam
   <% else %>
diff --git a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.erb b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.erb
index ec5b6a72349..080cf05355c 100644
--- a/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.erb
+++ b/lib/smart_answer_flows/marriage-abroad/outcomes/outcome_marriage_abroad_in_country.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
     <%= render partial: 'countries/'+calculator.ceremony_country+'/title', locals: {calculator: calculator} %>
 <% end %>
 
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.erb b/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.erb
index cb6ef93dee5..b2818368d86 100644
--- a/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.erb
+++ b/lib/smart_answer_flows/marriage-abroad/questions/country_of_ceremony.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where do you want to get married?
 <% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.erb b/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.erb
index 7e15e196a5f..b15e780531a 100644
--- a/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.erb
+++ b/lib/smart_answer_flows/marriage-abroad/questions/legal_residency.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where do you live?
 <% end %>
 
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.erb b/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.erb
index cd47731ac71..deb69a0a6e9 100644
--- a/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.erb
+++ b/lib/smart_answer_flows/marriage-abroad/questions/marriage_or_pacs.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you want to get married or enter into a PACS?
 <% end %>
 
@@ -7,6 +7,6 @@
   "pacs": "PACS"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   PACS (‘pacte civil de solidarité’, or ‘civil solidarity pact’) is the French version of civil partnership, and can be entered into by same-sex or opposite-sex couples.
 <% end %>
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.erb b/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.erb
index 2b6cbe9766d..a4db4bcba4c 100644
--- a/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.erb
+++ b/lib/smart_answer_flows/marriage-abroad/questions/partner_opposite_or_same_sex.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your partner of the opposite sex, or the same sex?
 <% end %>
 
diff --git a/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.erb b/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.erb
index 6a696f10643..82e14621796 100644
--- a/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.erb
+++ b/lib/smart_answer_flows/marriage-abroad/questions/what_is_your_partners_nationality.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your partner’s nationality?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.erb b/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.erb
index 6d4b4b5958c..6a763954c11 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/maternity_paternity_calculator.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Maternity, Adoption and paternity calculator for employers
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Calculate an employee’s maternity pay (SMP), paternity or adoption pay, relevant period and average weekly earnings
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.erb
index e4354c32f40..c8bad41c636 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.erb
@@ -1,3 +1,3 @@
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Use numbers like 12.34
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.erb
index 9e6ed5278ea..0f6dcbb73ea 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_date_leave_starts.erb
@@ -1,15 +1,15 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does the employee want to start their leave?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Leave can’t start before <%= a_leave_earliest_start_formatted %> or after <%= a_leave_latest_start_formatted %>.
 <% end %>
 
-<% render_content_for :error_leave_starts_too_early do %>
+<% text_for :error_leave_starts_too_early do %>
   Leave can’t start before <%= a_leave_earliest_start_formatted %>.
 <% end %>
 
-<% render_content_for :error_leave_starts_too_late do %>
+<% text_for :error_leave_starts_too_late do %>
   Leave can't start after <%= a_leave_latest_start_formatted %>.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.erb
index 53e7c0fe80d..fc4e1dafebd 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_did_the_employee_work_for_you.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if adoption_is_from_overseas%>
     Did the employee work for you on or before <%= format_date(overseas_adoption_leave_employment_threshold) %>?
   <% else %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.erb
index 3abc669c06a..6afbcaeeb35 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_employment_contract.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the employee have an employment contract with you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.erb
index 46ee1008cd9..3b580cd8f2c 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_from_overseas.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Will the child be coming from overseas?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.erb
index adb1771e76d..0b710a9c0a4 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/adoption_is_the_employee_on_your_payroll.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.erb
index 0b15b5ded82..d6c38484f30 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_birth_date_paternity.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is the actual birth date?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If unknown enter the due date.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.erb
index 94d485d1d07..780cc9d768b 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_maternity.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is the baby’s due date?
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.erb
index 94d485d1d07..780cc9d768b 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/baby_due_date_paternity.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is the baby’s due date?
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.erb
index efe7883fd69..a2f85e18700 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_leave_starts.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does the employee want to start their leave?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Based on the baby's due date, leave usually can’t start before <%= format_date(leave_earliest_start_date) %>.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a valid date
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.erb
index 44e3a49a342..e2dd15159f6 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_match.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if adoption_is_from_overseas %>
     When did the employee get permission to adopt?
   <% else %>
@@ -7,7 +7,7 @@
 <% end %>
 
 <% if adoption_is_from_overseas %>
-  <% render_content_for :hint do %>
+  <% text_for :hint do %>
     Enter the official notification date.
   <% end %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.erb
index d2cdaa0ef8b..4ce0d2da0fd 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/date_of_adoption_placement.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <% if adoption_is_from_overseas %>
     When will the child arrive in the UK?
   <% else %>
@@ -6,7 +6,7 @@
   <% end %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   <% if adoption_is_from_overseas %>
     Arrival date can’t be before official notification date
   <% else %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.erb
index 366c5ca224c..691ca07f7ca 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/day_of_the_month_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What particular day of the month is the employee paid?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.erb
index d082b34e985..42c93918aa8 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/days_of_the_week_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What days does the employee work?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.erb
index f059fea39ae..a4a387efedd 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the employee work for you on or before <%= format_date(employment_start) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.erb
index 27931481189..1114139d044 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/did_the_employee_work_for_you_between.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the employee have a contract with you covering
   <%= format_date(employment_start) %> to
   <%= format_date(qualifying_week_start) %>?
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.erb
index 549ecc7b738..f0abd45cb97 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/does_the_employee_work_for_you_now.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the employee have an employment contract with you now?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This includes written and verbal contracts.
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.erb
index 131cea48e4e..dfda9e88170 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What were the employee’s total earnings between <%= relevant_period %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is their earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.erb
index 131cea48e4e..dfda9e88170 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What were the employee’s total earnings between <%= relevant_period %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is their earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.erb
index d17fb197d28..b4fabd8914a 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What were the employee's total earnings between <%= relevant_period %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is the earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.erb
index a7d35e25f80..1b9048cb74c 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_date_matched_paternity_adoption.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When was the child matched with the employee?
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.erb
index 3abc669c06a..6afbcaeeb35 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_has_contract_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the employee have an employment contract with you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.erb
index adb1771e76d..0b710a9c0a4 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_on_payroll_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.erb
index d19587acd2b..3dd2e82c502 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_paternity_length.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How long is the employee's paternity leave?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.erb
index 5f8793d7f1b..459cd7a0477 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_responsible_for_upbringing.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the employee responsible for the child’s upbringing and either the biological father or the mother’s husband or partner?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.erb
index a96104b180f..b5114565ad3 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_start_paternity.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does the employee want to start their paternity leave?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Leave cannot start before <%= start_leave_hint %>.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.erb
index 9c2e153d23d..5475e7c6bf2 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_still_employed_on_birth_date.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Will the employee still be employed by you on <%= format_date(still_employed_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.erb
index f059fea39ae..a4a387efedd 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employee_work_before_employment_start.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the employee work for you on or before <%= format_date(employment_start) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.erb
index 3abc669c06a..6afbcaeeb35 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/employment_contract.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the employee have an employment contract with you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.erb
index 65c1f5f8fe9..a3a39103e02 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_sap_calculated.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How do you want the adoption pay calculated?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.erb
index 4000b041fe8..b339f3e5678 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_smp_calculated.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How do you want the Statutory Maternity Pay calculated? 
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.erb
index 7d941513db6..62e46b80a4a 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_do_you_want_the_spp_calculated.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How do you want the paternity pay calculated?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.erb
index 32eb685608e..9ecdf0a7489 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_2_weeks.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many fortnightly payments did the employee receive between <%= relevant_period %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.erb
index a08541a7724..53ad6efa407 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_every_4_weeks.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many payments did the employee receive between <%= relevant_period %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.erb
index a792d9a35bb..ef81e384eca 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_monthly.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many months' pay did the employee get between <%= relevant_period %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you have paid the employee 2 months’ pay in one month, count it as 2 payments.
   Do not include bonuses or other one-off payments.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.erb
index e4347797034..049de198279 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/how_many_payments_weekly.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many weeks' pay did the employee get between <%= relevant_period %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you have paid the employee 2 weeks’ pay in one week, count it as 2 payments.
   Do not include bonuses or other one-off payments.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.erb
index adb1771e76d..0b710a9c0a4 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/is_the_employee_on_your_payroll.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the employee (or will they be) on your payroll on <%= format_date(qualifying_week_start) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.erb
index 56790c7a061..4882ed6c4bc 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday on or before <%= to_saturday_formatted %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date on or before <%= to_saturday_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.erb
index 56790c7a061..4882ed6c4bc 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_adoption.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday on or before <%= to_saturday_formatted %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date on or before <%= to_saturday_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.erb
index 74f12886775..04da0b888ca 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/last_normal_payday_paternity.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday on or before <%= to_saturday_formatted %>
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date on or before <%= to_saturday_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.erb
index a185d77dfdc..0f0493d61c5 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/leave_or_pay_for_adoption.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the employee taking paternity leave or pay to adopt a child?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.erb
index 3df9a718fa9..abc37289875 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/monthly_pay_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When in the month is the employee paid?
 <% end %>
 
@@ -10,6 +10,6 @@
   "a_certain_week_day_each_month": "A certain week day each month"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.erb
index 022566475e0..b2f1aa9fad9 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/next_pay_day_paternity.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When is your employee's next pay day on or after <%= format_date(leave_start_date) %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.erb
index 81091b2f9bf..de425e040c1 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_date_of_adoption_placement.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When will the child be placed with the employee?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Placement date can't be before matching date
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.erb
index f5e7d1f26aa..ef6c20b1655 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/padoption_employee_responsible_for_upbringing.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the employee responsible for the child's upbringing and the husband or partner of the adopter or the child's adopter?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.erb
index 4077411c903..e6ab5bfc155 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_date_options_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.erb
index b6fd93dcd22..6ea31cd9767 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay the employee?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.erb
index 746062ea244..55ccdccb645 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_adoption.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay the employee?
 <% end %>
 
@@ -9,6 +9,6 @@
   "monthly": "Monthly"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they’re paid irregularly choose ‘weekly’.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.erb
index f1f9a4a7f70..88cb173e16b 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/pay_frequency_paternity.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay the employee?
 <% end %>
 
@@ -9,6 +9,6 @@
   "monthly": "Monthly"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they are paid irregularly choose 'weekly'.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.erb
index 1ff089cdccc..0a6834bee61 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday before <%= payday_offset_formatted %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date before <%= payday_offset_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.erb
index 1ff089cdccc..0a6834bee61 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_adoption.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday before <%= payday_offset_formatted %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date before <%= payday_offset_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.erb
index d11058a866d..4cf93739cfb 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/payday_eight_weeks_paternity.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What was the last normal payday before <%= payday_offset_formatted %>
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   <%= render partial: 'payday_question_hint' %>
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You must enter a date on or before <%= payday_offset_formatted %>
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.erb
index cf6f74c723a..5b563e4a22d 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/specific_date_each_month_paternity.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What specific date each month is the employee paid?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they are paid on the 25th enter '25'. The calculator will treat an employee as paid on the last day of the month if you enter '29', '30' or '31'.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter a date between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.erb
index 1b4ae208812..f4eca968185 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/taking_paternity_or_maternity_leave_for_adoption.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
 Is the employee taking paternity or maternity leave to adopt a child?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.erb
index d082b34e985..42c93918aa8 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_days_does_the_employee_work.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What days does the employee work?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.erb
index c8856dd831b..7ccbea94935 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_particular_day_of_the_month_is_the_employee_paid.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What particular day of the month is the employee paid?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.erb
index 81b164dc8f8..a445f3d7098 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_specific_date_each_month_is_the_employee_paid.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What specific date each month is the employee paid?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they’re paid on the 25th enter "25". The calculator will treat an employee as paid on the last day of the month if you enter 29, 30 or 31.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter a date between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.erb
index df9c8121900..54430fab025 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/what_type_of_leave.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What do you want to check?
 <% end %>
 
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.erb
index 3df9a718fa9..abc37289875 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_in_the_month_is_the_employee_paid.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When in the month is the employee paid?
 <% end %>
 
@@ -10,6 +10,6 @@
   "a_certain_week_day_each_month": "A certain week day each month"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If the pay date is the 29th, 30th or 31st choose 'Last working day of the month'.
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.erb
index 8c014e49403..23182fdf0d6 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/when_is_your_employees_next_pay_day.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When is your employee’s next pay day on or after <%= format_date(pay_start_date) %>?
 <% end %>
diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.erb b/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.erb
index 4077411c903..e6ab5bfc155 100644
--- a/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.erb
+++ b/lib/smart_answer_flows/maternity-paternity-calculator/questions/which_week_in_month_is_the_employee_paid.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the employee paid on the 1st, 2nd, 3rd, 4th or last <%= pay_day_in_week %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.erb
index a52e4d47594..a62dc1d305a 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/minimum_wage_calculator_employers.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   National Minimum Wage and Living Wage calculator for employers
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Check if you’re paying a worker the National Minimum Wage, the National Living Wage or if you owe them payments for the previous year.
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.erb
index e308c7044ae..314bc87a616 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/are_you_an_apprentice.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is the worker an apprentice?
 <% end %>
 
@@ -9,6 +9,6 @@
   "apprentice_over_19_second_year_onwards": "Apprentice 19 and over in their second year or onwards"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they’re 19 or over and they’ve completed the first year of their apprenticeship, they’re not eligible for the apprenticeship National Minimum Wage rate. They should be paid the National Minimum Wage for their age.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.erb
index a592f80c9ce..91b8354b2cd 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_charge.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you charge for accommodation per day?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.erb
index 6c35c53be04..69ccfab4784 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_accommodation_usage.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days per week does the worker live in the accommodation?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   7 is the highest number of days you can enter.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.erb
index bce43db4838..b9643432a43 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_additional_work_outside_shift.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the worker work additional time outside of their shift?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Additional time can be either starting early or finishing late outside their shift, for example attending a staff meeting or going through security checks.
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.erb
index df76050c8e9..7687f8e7f7f 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/current_paid_for_work_outside_shift.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you pay the worker for the additional time they worked outside of their shift?
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.erb
index 7b8ae056b5b..9ffd28f9974 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/did_employer_charge_for_job_requirements.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you take money from your worker’s pay for things they needed for their job?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is when a worker has bought items needed for their job themselves and has not been reimbursed. Or if the cost has been deducted from their pay.
 
   Items include clothing, uniforms, tools or other equipment they need for their job.
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.erb
index dd639dba340..2299bce55e4 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/does_employer_charge_for_job_requirements.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you take money from your worker’s pay for things they need for their job?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is when a worker has bought items needed for their job themselves and has not been reimbursed. Or if the cost has been deducted from their pay.
 
   Items include clothing, uniforms, tools or other equipment they need for their job.
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.erb
index e166da33d17..674afd52d1c 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_did_you_work.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours did the worker work during the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 This includes any time your employee was at work and needed to be available for work or any time spent travelling in connection with work (for example, travelling to a training course or between work locations). Do not include overtime or time taken to travel to their normal workplace.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
-<% render_content_for :error_hours do %>
+<% text_for :error_hours do %>
   Please enter the number of hours the worker actually worked during the pay period.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.erb
index 80f5f7f6a9e..329ede0b6d0 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_many_hours_do_you_work.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many hours does the worker work during the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 This includes any time your employee is at work and needs to be available for work or any time spent travelling in connection with work (for example, travelling to a training course or between work locations). Do not include overtime or time taken to travel to their normal workplace.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
-<% render_content_for :error_hours do %>
+<% text_for :error_hours do %>
   Please enter the number of hours the worker actually works during the pay period.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.erb
index ddd510d713a..ed767954d4d 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_are_you_paid_during_pay_period.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you pay the worker in the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 Do not include tips, overtime or anything else on top of their pay, for example money for clothes or goods.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.erb
index 97f84a3e398..66ebad428ea 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_much_were_you_paid_during_pay_period.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much did you pay the worker in the pay period?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
 Do not include tips, overtime or anything else on top of their pay, for example money for clothes or goods.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.erb
index d5e4d88a0c3..d62df47dc7c 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_did_you_get_paid.erb
@@ -1,12 +1,12 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often did you pay the worker?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The pay period in days
 <% end %>
 
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.erb
index 24a06a5e889..ace8853f314 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_often_do_you_get_paid.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How often do you pay the worker?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The pay period in days
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number between 1 and 31.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.erb
index 259c34a0c93..c5071dd36de 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_are_you.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old is the worker?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   years old
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a whole number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.erb
index ff005d4fcbd..5a274da0352 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/how_old_were_you.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old was the worker at the time?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   years old
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a whole number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.erb
index cc64835312d..7398218abd2 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/is_provided_with_accommodation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you provide accommodation?
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.erb
index 1fe29ce4133..76740d6c9fe 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_charge.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much did you charge for accommodation per day?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.erb
index 37b2ebfbfd7..a49cda12f2c 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_accommodation_usage.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many days per week did the worker live in the accommodation?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   7 is the highest number of days you can enter.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.erb
index d6c40af134b..126d4154146 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_additional_work_outside_shift.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the worker work additional time outside of their shift?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Additional time can be either starting early or finishing late outside their shift, for example attending a staff meeting or going through security checks.
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.erb
index 60a68cf7e54..bfcc2b636d9 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/past_paid_for_work_outside_shift.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you pay the worker for the additional time they worked outside of their shift?
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.erb
index ec999c4099e..4ca2ae02aa9 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/was_provided_with_accommodation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you provide accommodation?
 <% end %>
 
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.erb
index c51bc06f79f..eaf5bd10229 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/were_you_an_apprentice.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the worker an apprentice at the time?
 <% end %>
 
@@ -8,6 +8,6 @@
   "apprentice_over_19": "Apprentice aged 19 and over and in their first year"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If they were 19 or over and they had completed the first year of their apprenticeship, they were not eligible for the apprenticeship National Minimum Wage rate. They should have been paid the National Minimum Wage for their age.
 <% end %>
diff --git a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.erb b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.erb
index 387dfa417e6..5fa1e45e444 100644
--- a/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.erb
+++ b/lib/smart_answer_flows/minimum-wage-calculator-employers/questions/what_would_you_like_to_check.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What would you like to check?
 <% end %>
 
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.erb
index c76b4845960..b436f381957 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/part_year_profit_tax_credits.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Calculate your part-year profits to finalise your tax credits
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Calculate your part-year profits to end your Tax Credits award and claim Universal Credit if you’re self-employed
 <% end %>
 
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.erb
index 8691b820eb1..230ae555b54 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/did_you_start_trading_before_the_relevant_accounting_year.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you start trading before <%= format_date(accounting_year_begins_on) %>?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to select yes or no to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.erb
index 59a967aee5c..d6bcc621f18 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/do_your_accounts_cover_a_12_month_period.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do your accounts cover the 12 month period up to <%= format_date(accounting_year_ends_on) %>?
 <% end %>
 
@@ -7,6 +7,6 @@
   "no": "No"
 ) %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to select yes or no to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.erb
index 24ef464033e..11d9556a1ad 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/have_you_stopped_trading.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you stopped trading?
 <% end %>
 
@@ -7,10 +7,10 @@
   "no": "No"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This means you’re no longer running your business.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to select yes or no to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.erb
index f2b3940baaf..2289ffaff9b 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_date_do_your_accounts_go_up_to.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What date do your accounts go up to?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is the last date of the accounting period for your business. For most people, this will be 5 April.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a date to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.erb
index 7e2feccb5ad..c72fe4f1305 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/what_is_your_taxable_profit.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your actual or estimated taxable profit between <%= format_date(basis_period_begins_on) %> and <%= format_date(basis_period_ends_on) %>?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is the amount left over after you take all your earnings from self-employment and deduct any allowable expenses and losses. If this is over 2 years of accounts you need to add them together.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter your taxable profit.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.erb
index 5b25bf30a8e..644cf823165 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_start_trading.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you start trading?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This date must be before <%= format_date(award_period_ends_on) %>.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a date to continue.
 <% end %>
-<% render_content_for :error_invalid_start_trading_date do %>
+<% text_for :error_invalid_start_trading_date do %>
   The start trading date must be before the date your Tax Credits award ends.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.erb
index df7554fe9af..f6156ee751e 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_you_stop_trading.erb
@@ -1,14 +1,14 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you stop trading?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This date must be between <%= format_date(tax_year_begins_on) %> and <%= format_date(tax_year_ends_on) %>, which is the start and end dates of the tax year that your tax credit award ends in.
 <% end %>
 
-<% render_content_for :error_not_in_tax_year do %>
+<% text_for :error_not_in_tax_year do %>
   The date must be between <%= format_date(tax_year_begins_on) %> and <%= format_date(tax_year_ends_on) %>.
 <% end %>
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a date to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.erb b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.erb
index bc74519907a..023ca6afba1 100644
--- a/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.erb
+++ b/lib/smart_answer_flows/part-year-profit-tax-credits/questions/when_did_your_tax_credits_award_end.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did your Tax Credits award end?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You can find this on your award review.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You need to enter a date to continue.
 <% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.erb b/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.erb
index 9cc99e0519d..8db4a720ecf 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/pay_leave_for_parents.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check if you can get leave or pay when you have a child
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Pay and leave for parents
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.erb
index 617e6ddfa29..5613389b900 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/_warning_hint.erb
@@ -1,3 +1,3 @@
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Answer these questions about one job only. You'll need to use the calculator again if you have another job.
 <% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.erb
index 14c6d14c3a8..e5a6e3f1cf2 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/due_date.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When is the baby due?
 <% end %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.erb
index 1928280eb4d..9a5f343c1cf 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_mother.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What’s the employment status of the mother?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.erb
index d93e2d76d04..4fc6469d57a 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/employment_status_of_partner.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What’s the employment status of the mother’s partner?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.erb
index 08bb83b779f..4ddf21ca1cb 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_at_least_390.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother earn (or will she have earned) a total of £390 or more in any 13 weeks of this job between <%= format_date(calculator.earnings_employment_start_date) %> and <%= format_date(calculator.earnings_employment_end_date) %>?
 <% end %>
 <% content_for :hint do %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.erb
index 0b24bc963a1..2b3f5766854 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_earned_more_than_lower_earnings_limit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Has the mother earned (or will she have earned) more than <%= format_money(calculator.lower_earnings_amount) %> per week in this job between <%= format_date(calculator.lower_earnings_start_date) %> and <%= format_date(calculator.lower_earnings_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.erb
index 8eff25dae52..28ebe2a8274 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_started_working_before_continuity_start_date.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother start her current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.erb
index 411e78987db..697f66274fe 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_still_working_on_continuity_end_date.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the mother (or will she be) still working in that job on <%= format_date(calculator.continuity_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.erb
index 2130d5f4998..d6bb6947ea0 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/mother_worked_at_least_26_weeks.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother work (or will she have worked) for at least 26 weeks in this job between <%= format_date(calculator.earnings_employment_start_date) %> and <%= format_date(calculator.earnings_employment_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.erb
index 9a2f100442a..6d5711788e2 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_at_least_390.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother’s partner earn (or will they have earned) a total of £390 or more in any 13 weeks of this job between <%= format_date(calculator.earnings_employment_start_date) %> and <%= format_date(calculator.earnings_employment_end_date) %>?
 <% end %>
 <% content_for :hint do %>
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.erb
index acc761af8bf..081d393d916 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_earned_more_than_lower_earnings_limit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Has the mother’s partner earned (or will they have earned) more than <%= format_money(calculator.lower_earnings_amount) %> per week in this job between <%= format_date(calculator.lower_earnings_start_date) %> and <%= format_date(calculator.lower_earnings_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.erb
index 1cced5f953e..f8b9d8134fd 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_started_working_before_continuity_start_date.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother’s partner start their current or most recent job before <%= format_date(calculator.continuity_start_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.erb
index a82aa8f3e81..a17430f6b47 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_still_working_on_continuity_end_date.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the mother’s partner (or will they be) still working in that job on <%= format_date(calculator.continuity_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.erb
index b6fbb75eb4a..48bdd850118 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/partner_worked_at_least_26_weeks.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the mother’s partner work (or will they have worked) for at least 26 weeks in this job between <%= format_date(calculator.earnings_employment_start_date) %> and <%= format_date(calculator.earnings_employment_end_date) %>?
 <% end %>
 
diff --git a/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.erb b/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.erb
index 9ddbb165da5..6c0d7858a12 100644
--- a/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.erb
+++ b/lib/smart_answer_flows/pay-leave-for-parents/questions/two_carers.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Will the mother care for the child with a partner?
 <% end %>
 
diff --git a/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.erb b/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.erb
index cf5ae58f6b4..74a9547cbe0 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/outcomes/adoption_leave_details.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your Adoption Leave dates
 <% end %>
 
diff --git a/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.erb b/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.erb
index aefd9bd73eb..ba59a6e7608 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/plan_adoption_leave.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Plan your adoption leave
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out your Statutory Adoption Leave dates - Ordinary and Additional Adoption Leave period, notice period and earliest start date
 
 <% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.erb
index c4fa2fb40ca..5c7d7d71896 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/child_arrival_date.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When will the child start to live with you?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is sometimes known as the 'date of placement'.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a date after the match date.
 <% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.erb
index 4688118d16c..395728087b9 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/child_match_date.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When were you matched with the child?
 <% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.erb
index 334def78a23..5acf68a7b92 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/leave_start.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When do you want to start your adoption leave?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Leave can start up to 14 days before the child comes to live with you.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter a date up to 14 days before the child comes to live with you.
 <% end %>
diff --git a/lib/smart_answer_flows/plan-adoption-leave/questions/meta.erb b/lib/smart_answer_flows/plan-adoption-leave/questions/meta.erb
index 6a8c6edd12f..f12b6c33513 100644
--- a/lib/smart_answer_flows/plan-adoption-leave/questions/meta.erb
+++ b/lib/smart_answer_flows/plan-adoption-leave/questions/meta.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Plan your adoption leave
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.erb b/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.erb
index 4b5be907582..3802525a822 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/childs_date_of_birth.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your child’s date of birth?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.erb b/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.erb
index 00421a28f4b..e60f3977e31 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/country_of_birth.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which country was the child born in?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.erb b/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.erb
index 63237b72a88..1f8d29deb60 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/have_you_adopted_the_child.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you adopted the child?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.erb b/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.erb
index 73e4d0051d9..e4ccc4e6131 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/married_couple_or_civil_partnership.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Were you married to the other parent when your child was born?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.erb b/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.erb
index 9b30bf449bf..e844ffe924c 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/where_are_you_now.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where are you now?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-birth/questions/which_country.erb b/lib/smart_answer_flows/register-a-birth/questions/which_country.erb
index f3979de914b..18119a109e9 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/which_country.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/which_country.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which country?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.erb b/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.erb
index 3bf7a792e27..7036594727f 100644
--- a/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.erb
+++ b/lib/smart_answer_flows/register-a-birth/questions/who_has_british_nationality.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Who has British nationality?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-birth/register_a_birth.erb b/lib/smart_answer_flows/register-a-birth/register_a_birth.erb
index f508028f58a..90ddfe8eecf 100644
--- a/lib/smart_answer_flows/register-a-birth/register_a_birth.erb
+++ b/lib/smart_answer_flows/register-a-birth/register_a_birth.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Register a birth abroad
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Parents must register the birth in the country where the child was born - find out if you can also register the birth in the UK
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.erb b/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.erb
index 217738a18d9..3f4dd0b8f51 100644
--- a/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/did_the_person_die_at_home_hospital.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did the person die at home, in hospital or elsewhere?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-death/questions/was_death_expected.erb b/lib/smart_answer_flows/register-a-death/questions/was_death_expected.erb
index 7de44a47b4e..354bf069429 100644
--- a/lib/smart_answer_flows/register-a-death/questions/was_death_expected.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/was_death_expected.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was the death expected?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.erb b/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.erb
index 6711b439f41..e9b10f8b5eb 100644
--- a/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/where_are_you_now.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where are you now?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.erb b/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.erb
index 8904f8b778e..5a69e26db04 100644
--- a/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/where_did_the_death_happen.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where did the death happen?
 <% end %>
 
diff --git a/lib/smart_answer_flows/register-a-death/questions/which_country.erb b/lib/smart_answer_flows/register-a-death/questions/which_country.erb
index a8965337a77..757db9bd713 100644
--- a/lib/smart_answer_flows/register-a-death/questions/which_country.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/which_country.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which country did the death happen in?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.erb b/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.erb
index 2995d6df6ab..6fea9fd0b40 100644
--- a/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.erb
+++ b/lib/smart_answer_flows/register-a-death/questions/which_country_are_you_in_now.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which country are you in now?
 <% end %>
diff --git a/lib/smart_answer_flows/register-a-death/register_a_death.erb b/lib/smart_answer_flows/register-a-death/register_a_death.erb
index 9fa54fff814..5d38afc0d02 100644
--- a/lib/smart_answer_flows/register-a-death/register_a_death.erb
+++ b/lib/smart_answer_flows/register-a-death/register_a_death.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Register a death
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Find out how to register a death in the UK or abroad
 <% end %>
 
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.erb
index 45a2d1c5ed2..2b679d09a59 100644
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.erb
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/outcomes/contact_the_embassy.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You must report your lost or stolen passport
 <% end %>
 
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.erb
index f4cdb91ca7c..25d3f80abf5 100644
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.erb
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/where_was_the_passport_lost_or_stolen.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.erb
index b168e838e4d..22f411c95c8 100644
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.erb
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/questions/which_country.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   In which country?
 <% end %>
diff --git a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.erb b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.erb
index 48599b18b1c..fbbbe870555 100644
--- a/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.erb
+++ b/lib/smart_answer_flows/report-a-lost-or-stolen-passport/report_a_lost_or_stolen_passport.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Cancel a lost or stolen passport
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   What you need to do if your passport has been lost or stolen and you need to travel urgently - emergency travel document and replacement passport.
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.erb
index ee41a3160e0..b15843fa2c9 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/buying_new_vehicle.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have a new or secondhand vehicle that you'll be using for your business for the first time this tax year?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.erb
index 0ebe43ae870..b566b1c145d 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/capital_allowances.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you claimed capital allowances or simplified expenses for your existing vehicle before?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.erb
index 2de1407bd76..0ab609d48ac 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/car_status_before_usage.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Was your car new or second-hand when you started using it for your business?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.erb
index 383e7df9a5f..e934da85498 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/claimed_expenses_for_current_business.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you claimed expenses for your current business before?
 <% end %>
 
@@ -7,6 +7,6 @@
   "yes": "Yes"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you’re a new business you won’t have claimed expenses before.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.erb
index 318f4d73062..194d6c91b91 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/current_claim_amount_home.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much of your home costs do you expect to claim as business expenses this tax year?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The business proportion of utility bills, eg gas and electricity. Don't include phone and internet bills.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.erb
index 6e91ee6ac72..d699f7d66c3 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/deduct_from_premises.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to deduct from your business expenses this tax year for your private use of the premises?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   For example, a proportion of your maintenance, utility and insurance bills.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.erb
index e35fba832b1..77fafe1e07d 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_car_van.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many miles do you expect to drive your car or van for business during the tax year?
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.erb
index 19b467ccf92..dda97aeae64 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/drive_business_miles_motorcycle.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many miles do you expect to drive your motorcycle for business during the tax year?
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.erb
index 243ab947404..0b8ab43c98d 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/home_or_business_premises_expense.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have either of these expenses as part of your business?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.erb
index 63e20ca584a..c1ace4cba16 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/hours_work_home.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   On average, how many hours a month do you work or expect to work from home?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You have to work at least 25 hours per month from home to use simplified home expenses.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.erb
index 1c2bdc4362c..d7d048c6d59 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/how_much_expect_to_claim.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much do you expect to claim as business expenses for running and maintaining your car, van or motorcycle over the tax year?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Only include the business proportion of costs for your main vehicle, eg fuel, servicing, repairs and insurance.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.erb
index b59e855c188..bca9dd1446f 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/is_vehicle_green.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What are the car’s CO2 emissions?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.erb
index 5736bdea64e..ea8b9aa8930 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/people_live_on_premises.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many people normally live on the business premises?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Include children and non-paying guests. Don't include paying guests or anyone using the premises as part of your business. Give an average if there are more people at certain times of the year.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.erb
index 33744c4881c..cfde3aec9d9 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/price_of_vehicle.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much did you pay for the vehicle?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you already owned it use the vehicle’s market value. Include VAT unless your business is VAT registered. Don’t include any interest. 
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.erb
index 53b8e4858f4..14dd39c9378 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/type_of_expense.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have any of these expenses as part of your business?
 <% end %>
 
@@ -10,10 +10,10 @@
   "live_on_business_premises": "Living on your business premises (the main purpose of the building where you live is your business, eg a B&amp;B, and you're likely to pay business rates instead of council tax)"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you don't have any of these expenses go to 'Next step'.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   You can’t choose both ‘working from home’ or ‘living on your business premises’ Please choose one.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.erb
index 083ed4f6c28..a19e67b39b0 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_business_use_time.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much of the time will you use the vehicle for business?
 <% end %>
 
-<% render_content_for :suffix_label do %>
+<% text_for :suffix_label do %>
   % of the time
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   The maximum you can enter is 100%.
 <% end %>
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.erb b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.erb
index b5374db4ec8..f71fb25ae8e 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/questions/vehicle_expense.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have a vehicle that you use for your business?
 <% end %>
 
diff --git a/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.erb b/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.erb
index a7d333bf798..73e17e561b5 100644
--- a/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.erb
+++ b/lib/smart_answer_flows/simplified-expenses-checker/simplified_expenses_checker.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check if simplified expenses could save your business money
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Find out if simplified expenses suits your business. Compare what expenses you can claim using simplified expenses with what you can claim by working out the actual costs.
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.erb b/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.erb
index 40bde73914b..567727b3ba6 100644
--- a/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.erb
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/bus_pass_result.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your bus pass age
 
 <% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.erb b/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.erb
index 1ddfdbc7062..950446899a4 100644
--- a/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.erb
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/has_reached_sp_age.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You reached State Pension age on <%= format_date(calculator.state_pension_date) %>.
 
 <% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.erb b/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.erb
index 7e207bb65b7..bb8a7fc7606 100644
--- a/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.erb
+++ b/lib/smart_answer_flows/state-pension-age/outcomes/not_yet_reached_sp_age.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   You’ll reach State Pension age on <%= format_date(calculator.state_pension_date) %>.
 
 <% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/questions/dob_age.erb b/lib/smart_answer_flows/state-pension-age/questions/dob_age.erb
index 2ef2bb944f9..8deec17976f 100644
--- a/lib/smart_answer_flows/state-pension-age/questions/dob_age.erb
+++ b/lib/smart_answer_flows/state-pension-age/questions/dob_age.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your date of birth?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter your date of birth
 <% end %>
diff --git a/lib/smart_answer_flows/state-pension-age/questions/gender.erb b/lib/smart_answer_flows/state-pension-age/questions/gender.erb
index e5a0772d047..aa9a1cb914d 100644
--- a/lib/smart_answer_flows/state-pension-age/questions/gender.erb
+++ b/lib/smart_answer_flows/state-pension-age/questions/gender.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you a man or a woman?
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-age/questions/which_calculation.erb b/lib/smart_answer_flows/state-pension-age/questions/which_calculation.erb
index 1f39f584a63..fcb472ca2f7 100644
--- a/lib/smart_answer_flows/state-pension-age/questions/which_calculation.erb
+++ b/lib/smart_answer_flows/state-pension-age/questions/which_calculation.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What would you like to calculate?
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-age/state_pension_age.erb b/lib/smart_answer_flows/state-pension-age/state_pension_age.erb
index a94921da459..adb024223f4 100644
--- a/lib/smart_answer_flows/state-pension-age/state_pension_age.erb
+++ b/lib/smart_answer_flows/state-pension-age/state_pension_age.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Check your State Pension age
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out your State Pension age and Pension Credit qualifying age
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.erb
index 6bf81c3c766..ec0db3402e2 100644
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.erb
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you:
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.erb
index 8b9d5214d20..2d567caab81 100644
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.erb
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What is your marital status?
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.erb
index c27b977623a..30aa347974c 100644
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.erb
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When will (or did) you reach state pension age?
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.erb b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.erb
index 0a13f7b1c02..d28d8e97d30 100644
--- a/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.erb
+++ b/lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When will (or did) your spouse or civil partner reach state pension age?
 <% end %>
 
diff --git a/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.erb b/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.erb
index 0852c3341a9..d00924f2874 100644
--- a/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.erb
+++ b/lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Your partner’s National Insurance record and your State Pension
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   You may be able to increase your State Pension based on the National Insurance record
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.erb
index 835ad470309..4de6fa538b8 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_a_doctor_or_dentist.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you studying to be a doctor or dentist?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.erb
index 970cedc0caa..2f694c2be4b 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_dental_hygiene_or_dental_therapy.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you studying dental hygiene or dental therapy?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.erb b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.erb
index 610560d6581..9ac6310bff9 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/are_you_studying_one_of_these_dental_or_medical_courses.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you studying one of these courses?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.erb b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.erb
index 97eefea2abe..cf0df63fb96 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_all_uk_students.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do any of the following apply? (You might get extra funding.)
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.erb b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.erb
index 61cec88ebe0..b8c5d559ea2 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/do_any_of_the_following_apply_uk_full_time_students_only.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do any of the following apply? (You might get extra funding.)
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.erb
index 1d63c8c919c..19ff556aeb7 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_does_a_full_time_student_study.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many credits a year does a full-time student study?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Ask your university or college if you're not sure.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than or equal to your part-time study credits (<%= calculator.part_time_credits %>)
 <% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.erb
index 7529ad2cb06..15af2be51f4 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_many_credits_will_you_study.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How many credits will you study in the <%= calculator.course_start_years[0] %> to <%= calculator.course_start_years[1] %> academic year?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   Ask your university or college if you're not sure.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number greater than 0
 <% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.erb b/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.erb
index 4908c029b9f..a863de5c9e4 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/how_much_are_your_tuition_fees_per_year.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How much are your tuition fees per year?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   The maximum is <%= format_money(calculator.tuition_fee_maximum_full_time) %> for full-time students and <%= format_money(calculator.tuition_fee_maximum_part_time) %> for part-time students.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Please enter a number up to the maximum amount (<%= format_money(calculator.tuition_fee_maximum_full_time) %> for full-time, <%= format_money(calculator.tuition_fee_maximum_part_time) %> for part-time), don’t enter ‘£’
 <% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.erb b/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.erb
index 8d962ab8c18..991615595aa 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/what_course_are_you_studying.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you studying one of these courses?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.erb b/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.erb
index 9b642550fdf..202329216e8 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/what_type_of_student_are_you.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What type of student are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.erb b/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.erb
index 4c45484bd38..3dee7df700c 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/whats_your_household_income.erb
@@ -1,11 +1,11 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What's your annual household income?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   This is your parents’ or partner’s taxable income plus your own. It affects how much help you'll get with living costs.
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Enter a number - don’t use the £ sign.
 <% end %>
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.erb b/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.erb
index 1c2219ac716..59b880f4f00 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/when_does_your_course_start.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does your course start?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.erb b/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.erb
index ce92c1de143..50e783c2013 100644
--- a/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/questions/where_will_you_live_while_studying.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Where will you live while studying?
 <% end %>
 
diff --git a/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.erb b/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.erb
index 12bb50646d8..c6901dafb8f 100644
--- a/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.erb
+++ b/lib/smart_answer_flows/student-finance-calculator/student_finance_calculator.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Student finance calculator
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Student finance calculator - get a quick estimate of what student loans, grants, bursaries and other funding you could get - for full-time, part-time and EU students
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.erb b/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.erb
index 811da8f3759..1ae3082acbe 100644
--- a/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/bus_licenceholder.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you already have a full category D bus licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.erb b/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.erb
index b71e115ca71..f5c9f766f1d 100644
--- a/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/car_licence_before_jan_1997.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Did you pass your test before 1 January 1997?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.erb b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.erb
index 263bff2ceed..2ca801d7073 100644
--- a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you pass your car driving test?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.erb b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.erb
index 4e0fd6f0d11..57f06b33a72 100644
--- a/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/date_licence_was_issued_msv.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When was your driving licence issued?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.erb b/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.erb
index 9e73ce29071..06eb3a4df9c 100644
--- a/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/do_you_have_lv_or_bus_towing_entitlement.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have a full category D+E towing with a bus licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.erb b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.erb
index 85e8411fd4d..502c4f3a9f8 100644
--- a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_licence.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you already have a category C large vehicle licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.erb b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.erb
index bde850e3a4a..fb3c4d308d5 100644
--- a/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_large_vehicle_towing_entitlements.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you already have a driving licence with the C+E towing with a large vehicle entitlement on it?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.erb b/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.erb
index 5ac61d546e5..ff289bd7be7 100644
--- a/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/existing_towing_entitlements.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you already have a driving licence with any of the following entitlements on it:
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.erb b/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.erb
index e425e8e674c..d4d4b6f5dbc 100644
--- a/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/full_minibus_licence.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have a full category D1 minibus licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.erb b/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.erb
index 6801716ea90..8115859be9c 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_long_entitlements.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When did you get this entitlement on your licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.erb
index 8c3a3b9fdba..f38f4c247d4 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_bus.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.erb
index 8c3a3b9fdba..f38f4c247d4 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_lv.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.erb
index 8c3a3b9fdba..f38f4c247d4 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_minibus.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.erb
index 8c3a3b9fdba..f38f4c247d4 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.erb b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.erb
index d2c639e0814..9c1c8cfce95 100644
--- a/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/how_old_are_you_msv_2.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How old are you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.erb b/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.erb
index c82686f093d..9d780450ec7 100644
--- a/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/medium_sized_vehicle_licenceholder.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you already have a C1 medium-sized vehicle licence?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.erb b/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.erb
index e093bda5a55..8289b0b2b9d 100644
--- a/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.erb
+++ b/lib/smart_answer_flows/towing-rules/questions/towing_vehicle_type.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   What kind of vehicle do you want to tow with?
 <% end %>
 
diff --git a/lib/smart_answer_flows/towing-rules/towing_rules.erb b/lib/smart_answer_flows/towing-rules/towing_rules.erb
index b92dd06339d..9004cb4d08a 100644
--- a/lib/smart_answer_flows/towing-rules/towing_rules.erb
+++ b/lib/smart_answer_flows/towing-rules/towing_rules.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Towing: licence and age requirements
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out if you’re old enough or have the right kind of licence to tow a trailer from different kinds of vehicle
 
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.erb
index 4fc6fdb20cb..0b045443d4a 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_claiming_benefits.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you or a family member getting State Pension, Industrial Injuries Benefit, ESA (contributory) or bereavement benefits?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.erb
index 06cec7e933e..7c24f53602f 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/db_how_long_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= how_long_question_titles %>
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.erb
index 6d47f184851..e130fce6569 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/do_either_of_the_following_apply.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Does the following apply to you?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you do not receive any of these click 'Next step'.
 
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.erb
index 19864488a25..c7ee3c2c9ce 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_smp.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you eligible for Statutory Maternity Pay?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.erb
index 73569bcd6ff..9290cfb91e1 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/eligible_for_tax_credits.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you or your partner one of the following?
 <% end %>
 
@@ -8,6 +8,6 @@
   "none_of_the_above": "None of the above"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   A Crown servant is someone who works for the UK government. A cross-border worker is someone who regularly travels to or from another country to work.
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.erb
index c673565b6ba..d6a56ae9d3f 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/employer_paying_ni.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Is your employer paying National Insurance contributions for you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.erb
index b1b6147207c..01254ae4107 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/esa_how_long_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= how_long_question_titles %>
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.erb
index 9d466d9c595..52796c522bd 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/going_or_already_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you currently:
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.erb
index d466bc70657..73ac521371c 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/iidb_already_claiming.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you currently receiving Industrial Injuries Disablement Benefit?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.erb
index 358bac580a9..4ed2d699a14 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_abroad_for_treatment.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you going abroad to get medical treatment for the illness or disability that prevents you from working?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.erb
index 6c066052b79..98254e05f83 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_any_of_the_following_apply.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do any of the following apply to you?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.erb
index 19b49b9d9db..17e77e3b3ad 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_claiming_benefits.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you travelling abroad with a partner who is getting Income Support with one of the following premiums ?
 <% end %>
 
@@ -6,7 +6,7 @@
   Your partner must be getting the <a href='/income-support/what-youll-get'>premium</a>, not you.
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If no, click ‘Next Step’.
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.erb
index 03cd49f02d8..1e2e4bb8e70 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_either_of_the_following.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which of these applies to you?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If neither apply, click 'Next Step'.
 
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.erb
index a6e64a7dfb0..15807d422ea 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_how_long_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How long are you going abroad for?
 <% end %>
 
@@ -8,6 +8,6 @@
   "is_more_than_a_year": "More than 1 year"
 ) %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   You can't apply for Income Support from abroad.
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.erb
index a764cf6e821..0f60cec8280 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/is_work_or_sick_pay.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Have you been unable to work or received Statutory Sick Pay for one of the following?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you don’t receive either of these click 'Next step'.
 
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.erb
index ffe4d51e1e7..3b6993d8cc5 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/jsa_how_long_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   If you're claiming JSA, how long are you going abroad for?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.erb
index 2aeed383874..c8c36e56191 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_children.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Do you have any children?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.erb
index d91b8c143a5..b2324f00913 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_currently_claiming.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you currently claiming any of the following?
 <% end %>
 
-<% render_content_for :hint do %>
+<% text_for :hint do %>
   If you don’t receive any of these click 'Next step'.
 
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.erb
index 2eb2b187957..e8cdec7d826 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_how_long_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= how_long_question_titles %>
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.erb
index 9bfc89c6e32..2c7627e07b8 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/tax_credits_why_going_abroad.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= why_abroad_question_title %>
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.erb
index 30315904abe..ca249b1b76d 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_benefit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Which benefit will you be claiming?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.erb
index 2ee71e22398..c4c6fe08ee1 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/which_country.erb
@@ -1,3 +1,3 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   <%= country_question_title %>
 <% end %>
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.erb
index 9da4507126e..428ba0d5c63 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_a_uk_employer.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you working for a UK employer and paying Class 1 National Insurance Contributions?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.erb b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.erb
index 2a971e7a3f1..f1c3c4d7ad0 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/questions/working_for_uk_employer_ssp.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Are you working for a UK employer?
 <% end %>
 
diff --git a/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.erb b/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.erb
index a9a5d55de85..0474fc79ba9 100644
--- a/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.erb
+++ b/lib/smart_answer_flows/uk-benefits-abroad/uk_benefits_abroad.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   UK benefits if you're going or living abroad
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Find out what benefits you might be able to receive while you're abroad and how to export them from the UK or claim them while abroad
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.erb
index 3840fd4fa8c..131d2dd651e 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bacs_direct_credit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by Bacs Direct Credit
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.erb
index da92b201053..087e2c32ff7 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_bank_giro.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by Bank Giro
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.erb
index 7399bf95a0f..e0119f76722 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_chaps.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by CHAPS
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.erb
index 24fcc05b586..a581d6da686 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_cheque.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by cheque
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.erb
index 56989b4d352..a312c356ee7 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_direct_debit.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by direct debit
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.erb
index 2b4cdc3e09a..a0070f45800 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_debit_credit_card.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying by online debit or credit card
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.erb b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.erb
index d29bd68aa98..e30644f0847 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/outcomes/result_online_telephone_banking.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   Paying online or by telephone banking
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.erb b/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.erb
index 0d3e265568b..a8465bdcf6b 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/questions/how_do_you_want_to_pay.erb
@@ -1,4 +1,4 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   How do you want to pay?
 <% end %>
 
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.erb b/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.erb
index d4d62153cc0..f33e2e651c7 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/questions/when_does_your_vat_accounting_period_end.erb
@@ -1,7 +1,7 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   When does your VAT accounting period end?
 <% end %>
 
-<% render_content_for :error_message do %>
+<% text_for :error_message do %>
   Your accounting period must end at the last day of the month.
 <% end %>
diff --git a/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.erb b/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.erb
index 503fbf37023..e52750286a6 100644
--- a/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.erb
+++ b/lib/smart_answer_flows/vat-payment-deadlines/vat_payment_deadlines.erb
@@ -1,8 +1,8 @@
-<% render_content_for :title do %>
+<% text_for :title do %>
   VAT payment deadline calculator
 <% end %>
 
-<% render_content_for :meta_description do %>
+<% text_for :meta_description do %>
   Work out the VAT payment deadline for your accounting period.
 <% end %>